Fixes for python3 in recipes and sdl2 bootstrap

inclement · inclement · commit 9f3d27527d98 · 2015-10-04T14:14:37.000+01:00
diff --git a/pythonforandroid/bootstraps/pygame/__init__.py b/pythonforandroid/bootstraps/pygame/__init__.py
@@ -18,7 +18,7 @@ def run_distribute(self):
         # src_path = join(self.ctx.root_dir, 'bootstrap_templates',
         #                 self.name)
         src_path = join(self.bootstrap_dir, 'build')
-        
+
         with current_directory(self.dist_dir):
 
             info('Creating initial layout')
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -88,7 +88,7 @@ def run_distribute(self):
             warning('Can\'t find strip in PATH...')
         strip = sh.Command(strip)
         filens = shprint(sh.find, join(self.dist_dir, 'private'), join(self.dist_dir, 'libs'),
-                '-iname', '*.so', _env=env).stdout
+                '-iname', '*.so', _env=env).stdout.decode('utf-8')
         logger.info('Stripping libraries in private dir')
         for filen in filens.split('\n'):
             try:
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -62,7 +62,7 @@ def render(template, dest, **kwargs):
     template = environment.get_template(template)
     text = template.render(**kwargs)
 
-    f = file(dest, 'wb')
+    f = open(dest, 'wb')
     f.write(text.encode('utf-8'))
     f.close()
 
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -88,7 +88,7 @@ def build_armeabi(self):
                         _env=env)
             except sh.ErrorReturnCode_2:
                 print('First python2 make failed. This is expected, trying again.')
-
+                
 
             print('Second install (expected to work)')
             shprint(sh.touch, 'python.exe', 'python')
