gyp: more decode stdout on Python 3

PR-URL: #1894 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Sam Roberts <[email protected]>
nodejs · Sep 27, 2019 · 36638af · 36638af
1 parent f753c16
commit 36638af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/gyp/gyp_main.py b/gyp/gyp_main.py
@@ -8,13 +8,17 @@
 import sys
 import subprocess
 
+PY3 = bytes != str
+
 # Below IsCygwin() function copied from pylib/gyp/common.py
 def IsCygwin():
  try:
  out = subprocess.Popen("uname",
  stdout=subprocess.PIPE,
  stderr=subprocess.STDOUT)
- stdout,stderr = out.communicate()
+ stdout, stderr = out.communicate()
+ if PY3:
+ stdout = stdout.decode("utf-8")
  return "CYGWIN" in str(stdout)
  except Exception:
  return False
@@ -27,7 +31,9 @@ def UnixifyPath(path):
  out = subprocess.Popen(["cygpath", "-u", path],
  stdout=subprocess.PIPE,
  stderr=subprocess.STDOUT)
- stdout,stderr = out.communicate()
+ stdout, stderr = out.communicate()
+ if PY3:
+ stdout = stdout.decode("utf-8")
  return str(stdout)
  except Exception:
  return path

diff --git a/gyp/pylib/gyp/common.py b/gyp/pylib/gyp/common.py
@@ -11,6 +11,8 @@
 import sys
 import subprocess
 
+PY3 = bytes != str
+
 
 # A minimal memoizing decorator. It'll blow up if the args aren't immutable,
 # among other "problems".
@@ -623,7 +625,9 @@ def IsCygwin():
  out = subprocess.Popen("uname",
  stdout=subprocess.PIPE,
  stderr=subprocess.STDOUT)
- stdout,stderr = out.communicate()
+ stdout, stderr = out.communicate()
+ if PY3:
+ stdout = stdout.decode("utf-8")
  return "CYGWIN" in str(stdout)
  except Exception:
  return False