more python 3 compatibility fixes

mjansson · Feb 13, 2018 · 8caf826 · 8caf826
1 parent 6c2129f
commit 8caf826
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/ninja/toolchain.py b/build/ninja/toolchain.py
@@ -133,13 +133,13 @@ def initialize_default_archs(self):
     if self.target.is_windows():
       self.archs = ['x86-64']
     elif self.target.is_linux() or self.target.is_bsd():
-      localarch = subprocess.check_output(['uname', '-m']).strip()
+      localarch = subprocess.check_output(['uname', '-m']).decode().strip()
       if localarch == 'x86_64' or localarch == 'amd64':
         self.archs = ['x86-64']
       elif localarch == 'i686':
         self.archs = ['x86']
       else:
-        self.archs = [str(localarch)]
+        self.archs = [localarch]
     elif self.target.is_macos():
       self.archs = ['x86-64']
     elif self.target.is_ios():

diff --git a/build/ninja/version.py b/build/ninja/version.py
@@ -16,7 +16,7 @@ def generate_version_string(libname):
     gitcmd = 'git.exe'
   try:
     git_version = subprocess.check_output( [ gitcmd, 'describe', '--long' ], stderr = subprocess.STDOUT ).strip()
-    tokens = git_version.split( '-' )
+    tokens = git_version.decode().split( '-' )
     version_numbers = tokens[0].split( '.' )
   except Exception:
     pass