Misc python3 fixes in xcode_emulation.

BUG=gyp:36 Change-Id: I740beedd6bf8fca2d8db03ee57e762201b5d1df4 Reviewed-on: https://chromium-review.googlesource.com/c/external/gyp/+/1633670 Reviewed-by: Mark Mentovai <[email protected]>
desktop-app · May 29, 2019 · da63cb0 · da63cb0
1 parent 5c270f7
commit da63cb0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py
@@ -526,7 +526,7 @@ def _XcodeSdkPath(self, sdk_root):
       XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
       if sdk_root:
         XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
-    return XcodeSettings._sdk_path_cache[sdk_root]
+    return XcodeSettings._sdk_path_cache[sdk_root].decode()
 
   def _AppendPlatformVersionMinFlags(self, lst):
     self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
@@ -1413,7 +1413,7 @@ def XcodeVersion():
   version = version_list[0]
   build = version_list[-1]
   # Be careful to convert "4.2" to "0420":
-  version = version.split()[-1].replace('.', '')
+  version = version.split()[-1].decode().replace('.', '')
   version = (version + '0' * (3 - len(version))).zfill(4)
   if build:
     build = build.split()[-1]
@@ -1450,7 +1450,7 @@ def GetStdout(cmdlist):
   job = subprocess.Popen(cmdlist, stdout=subprocess.PIPE)
   out = job.communicate()[0]
   if job.returncode != 0:
-    sys.stderr.write(out + '\n')
+    sys.stderr.write(out + b'\n')
     raise GypError('Error %d running %s' % (job.returncode, cmdlist[0]))
   return out.rstrip('\n')