From: Scott Worley <scottworley@scottworley.com>
Date: Sat, 23 May 2020 00:23:22 +0000 (-0700)
Subject: Appease new mypy 0.761 -> 0.770
X-Git-Tag: 1.3~11
X-Git-Url: http://git.scottworley.com/pinch/commitdiff_plain/de68382af99d04266b2ca33967ff6ca4a3c87947?ds=sidebyside

Appease new mypy 0.761 -> 0.770
---

diff --git a/pinch.py b/pinch.py
index ad49334..a7d5b65 100644
--- a/pinch.py
+++ b/pinch.py
@@ -360,7 +360,8 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None:
                            stdout=subprocess.PIPE)
     tar = subprocess.Popen(
         ['tar', 'x', '-C', dest, '-f', '-'], stdin=git.stdout)
-    git.stdout.close()
+    if git.stdout:
+        git.stdout.close()
     tar.wait()
     git.wait()
     v.result(git.returncode == 0 and tar.returncode == 0)
@@ -451,7 +452,7 @@ def git_revision_name(v: Verification, channel: Channel) -> str:
                               '--abbrev=11',
                               channel.git_revision],
                              capture_output=True)
-    v.result(process.returncode == 0 and process.stdout != '')
+    v.result(process.returncode == 0 and process.stdout != b'')
     return '%s-%s' % (os.path.basename(channel.git_repo),
                       process.stdout.decode().strip())