Fixes to run under python3

inclement · inclement · commit ccab21338500 · 2016-01-10T22:04:43.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -97,7 +97,8 @@ def run_distribute(self):
 
                 info('Renaming .so files to reflect cross-compile')
                 site_packages_dir = 'crystax_python/crystax_python/site-packages'
-                filens = shprint(sh.find, site_packages_dir, '-iname', '*.so').stdout.split('\n')[:-1]
+                filens = shprint(sh.find, site_packages_dir, '-iname', '*.so').stdout.decode(
+                    'utf-8').split('\n')[:-1]
                 for filen in filens:
                     parts = filen.split('.')
                     if len(parts) <= 2:
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -211,7 +211,7 @@ def prepare_build_environment(self, user_sdk_dir, user_ndk_dir,
         self.android_api = android_api
 
         android = sh.Command(join(sdk_dir, 'tools', 'android'))
-        targets = android('list').stdout.split('\n')
+        targets = android('list').stdout.decode('utf-8').split('\n')
         apis = [s for s in targets if re.match(r'^ *API level: ', s)]
         apis = [re.findall(r'[0-9]+', s) for s in apis]
         apis = [int(s[0]) for s in apis if s]
diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py
@@ -8,9 +8,10 @@
 from collections import defaultdict
 from colorama import Style as Colo_Style, Fore as Colo_Fore
 
-import codecs
-stdout = codecs.getwriter('utf8')(stdout)
-stderr = codecs.getwriter('utf8')(stderr)
+# This codecs change fixes a bug with log output, but crashes under python3
+# import codecs
+# stdout = codecs.getwriter('utf8')(stdout)
+# stderr = codecs.getwriter('utf8')(stderr)
 
 # monkey patch to show full output
 sh.ErrorReturnCode.truncate_cap = 999999
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -830,7 +830,10 @@ def build_cython_components(self, arch):
         env = self.get_recipe_env(arch)
 
         if self.ctx.python_recipe.from_crystax:
-            site_packages_dirs = sh.Command('python{}'.format(self.ctx.python_recipe.version))('-c', 'import site; print("\\n".join(site.getsitepackages()))').stdout.split('\n')
+            command = sh.Command('python{}'.format(self.ctx.python_recipe.version))
+            site_packages_dirs = command(
+                '-c', 'import site; print("\\n".join(site.getsitepackages()))')
+            site_packages_dirs = site_packages_dirs.stdout.decode('utf-8').split('\n')
             # env['PYTHONPATH'] = '/usr/lib/python3.5/site-packages/:/usr/lib/python3.5'
             if 'PYTHONPATH' in env:
                 env['PYTHONPATH'] = env + ':{}'.format(':'.join(site_packages_dirs))
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -88,7 +88,7 @@ def do_python_build(self, arch):
             # neatness, but the whole recipe needs tidying along these
             # lines
             env['HOSTARCH'] = 'arm-eabi'
-            env['BUILDARCH'] = shprint(sh.gcc, '-dumpmachine').stdout.split('\n')[0]
+            env['BUILDARCH'] = shprint(sh.gcc, '-dumpmachine').stdout.decode('utf-8').split('\n')[0]
             env['CFLAGS'] = ' '.join([env['CFLAGS'], '-DNO_MALLINFO'])
 
             # TODO need to add a should_build that checks if optional
