Fix bytes/unicode issues in android recipe

KeyWeeUsr · KeyWeeUsr · commit 32ef178fb53a · 2018-12-10T23:35:01.000+01:00
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -1,10 +1,10 @@
+from __future__ import unicode_literals
 from pythonforandroid.recipe import CythonRecipe, IncludedFilesBehaviour
 from pythonforandroid.util import current_directory
 from pythonforandroid.patching import will_build
 from pythonforandroid import logger
 
 from os.path import join
-from sys import version_info
 
 
 class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
@@ -26,27 +26,35 @@ def get_recipe_env(self, arch):
 
     def prebuild_arch(self, arch):
         super(AndroidRecipe, self).prebuild_arch(arch)
+        ctx_bootstrap = self.ctx.bootstrap.name
 
+        # define macros for Cython, C, Python
         tpxi = 'DEF {} = {}\n'
         th = '#define {} {}\n'
         tpy = '{} = {}\n'
 
-        bootstrap = self.ctx.bootstrap.name
-        bootstrap = bootstrap_name = bootstrap if version_info >= (3, ) else bootstrap.decode('utf-8')
+        # make sure bootstrap name is in unicode
+        if isinstance(ctx_bootstrap, bytes):
+            ctx_bootstrap = ctx_bootstrap.decode('utf-8')
+        bootstrap = bootstrap_name = ctx_bootstrap
+
         is_sdl2 = bootstrap_name in ('sdl2', 'sdl2python3', 'sdl2_gradle')
         is_pygame = bootstrap_name in ('pygame',)
         is_webview = bootstrap_name in ('webview',)
 
         if is_sdl2 or is_webview:
             if is_sdl2:
                 bootstrap = 'sdl2'
-            java_ns = u'org.kivy.android'
-            jni_ns = u'org/kivy/android'
+            java_ns = 'org.kivy.android'
+            jni_ns = 'org/kivy/android'
         elif is_pygame:
-            java_ns = 'org.renpy.android'
-            jni_ns = 'org/renpy/android'
+            java_ns = b'org.renpy.android'
+            jni_ns = b'org/renpy/android'
         else:
-            logger.error('unsupported bootstrap for android recipe: {}'.format(bootstrap_name))
+            logger.error((
+                'unsupported bootstrap for android recipe: {}'
+                ''.format(bootstrap_name)
+            ))
             exit(1)
 
         config = {
@@ -58,22 +66,28 @@ def prebuild_arch(self, arch):
             'JNI_NAMESPACE': jni_ns,
         }
 
+        # create config files for Cython, C and Python
         with (
                 current_directory(self.get_build_dir(arch.arch))), (
                 open(join('android', 'config.pxi'), 'w')) as fpxi, (
                 open(join('android', 'config.h'), 'w')) as fh, (
                 open(join('android', 'config.py'), 'w')) as fpy:
+
             for key, value in config.items():
                 fpxi.write(tpxi.format(key, repr(value)))
                 fpy.write(tpy.format(key, repr(value)))
-                fh.write(th.format(key,
-                                   value if isinstance(value, int)
-                                   else '"{}"'.format(value)))
+
+                fh.write(th.format(
+                    key,
+                    value if isinstance(value, int) else '"{}"'.format(value)
+                ))
                 self.config_env[key] = str(value)
 
             if is_sdl2:
                 fh.write('JNIEnv *SDL_AndroidGetJNIEnv(void);\n')
-                fh.write('#define SDL_ANDROID_GetJNIEnv SDL_AndroidGetJNIEnv\n')
+                fh.write(
+                    '#define SDL_ANDROID_GetJNIEnv SDL_AndroidGetJNIEnv\n'
+                )
             elif is_pygame:
                 fh.write('JNIEnv *SDL_ANDROID_GetJNIEnv(void);\n')
 
