Initial fixes for python3

inclement · inclement · commit 45bf09ee5cbf · 2015-10-04T14:14:37.000+01:00
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -17,17 +17,17 @@ def prebuild_armeabi(self):
             print('Python2 already patched, skipping.')
             return
         self.apply_patch(join('patches', 'Python-{}-xcompile.patch'.format(self.version)))
-	self.apply_patch(join('patches', 'disable-modules.patch'))
-	self.apply_patch(join('patches', 'fix-locale.patch'))
-	self.apply_patch(join('patches', 'fix-gethostbyaddr.patch'))
-	self.apply_patch(join('patches', 'fix-setup-flags.patch'))
-	self.apply_patch(join('patches', 'fix-filesystemdefaultencoding.patch'))
-	self.apply_patch(join('patches', 'fix-termios.patch'))
-	self.apply_patch(join('patches', 'custom-loader.patch'))
-	self.apply_patch(join('patches', 'verbose-compilation.patch'))
-	self.apply_patch(join('patches', 'fix-remove-corefoundation.patch'))
-	self.apply_patch(join('patches', 'fix-dynamic-lookup.patch'))
-	self.apply_patch(join('patches', 'fix-dlfcn.patch'))
+        self.apply_patch(join('patches', 'disable-modules.patch'))
+        self.apply_patch(join('patches', 'fix-locale.patch'))
+        self.apply_patch(join('patches', 'fix-gethostbyaddr.patch'))
+        self.apply_patch(join('patches', 'fix-setup-flags.patch'))
+        self.apply_patch(join('patches', 'fix-filesystemdefaultencoding.patch'))
+        self.apply_patch(join('patches', 'fix-termios.patch'))
+        self.apply_patch(join('patches', 'custom-loader.patch'))
+        self.apply_patch(join('patches', 'verbose-compilation.patch'))
+        self.apply_patch(join('patches', 'fix-remove-corefoundation.patch'))
+        self.apply_patch(join('patches', 'fix-dynamic-lookup.patch'))
+        self.apply_patch(join('patches', 'fix-dlfcn.patch'))
 
         if uname()[0] == 'Linux':
             self.apply_patch(join('patches', 'fix-configure-darwin.patch'))
@@ -55,7 +55,7 @@ def build_armeabi(self):
 
         with current_directory(self.get_build_dir('armeabi')):
 
-            
+
             hostpython_recipe = Recipe.get_recipe('hostpython2', self.ctx)
             shprint(sh.cp, join(hostpython_recipe.get_recipe_dir(), 'Setup'), 'Modules')
 
@@ -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')
@@ -113,8 +113,8 @@ def build_armeabi(self):
                          'python.host'))
             self.ctx.hostpython = join(self.ctx.build_dir, 'python-install',
                                        'bin', 'python.host')
-                    
-            
+
+
             # reduce python?
             for dir_name in ('test', join('json', 'tests'), 'lib-tk',
                              join('sqlite3', 'test'), join('unittest, test'),
@@ -123,11 +123,6 @@ def build_armeabi(self):
                              'curses'):
                 shprint(sh.rm, '-rf', join(self.ctx.build_dir, 'python-install',
                                            'lib', 'python2.7', dir_name))
-            
-
-            
-
-        
 
 
 recipe = Python2Recipe()
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -1409,8 +1409,11 @@ def prepare_build_dir(self, arch):
 
     @classmethod
     def list_recipes(cls):
+        forbidden_dirs = ('__pycache__', )
         recipes_dir = join(dirname(__file__), "recipes")
         for name in listdir(recipes_dir):
+            if name in forbidden_dirs:
+                continue
             fn = join(recipes_dir, name)
             if isdir(fn):
                 yield name
@@ -1424,6 +1427,7 @@ def get_recipe(cls, name, ctx):
         mod = importlib.import_module("pythonforandroid.recipes.{}".format(name))
         if len(logger.handlers) > 1:
             logger.removeHandler(logger.handlers[1])
+        print('mod is', mod)
         recipe = mod.recipe
         recipe.recipe_dir = join(ctx.root_dir, "recipes", name)
         recipe.ctx = ctx
@@ -2057,11 +2061,15 @@ def recipes(self, args):
             ctx = self.ctx
             for name in Recipe.list_recipes():
                 recipe = Recipe.get_recipe(name, ctx)
+                print('recipe is', recipe, recipe.name, recipe.version)
+                print(type(recipe.name), type(recipe.version))
+                version = str(recipe.version)
                 if args.color:
                     print('{Fore.BLUE}{Style.BRIGHT}{recipe.name:<12} '
                           '{Style.RESET_ALL}{Fore.LIGHTBLUE_EX}'
-                          '{recipe.version:<8}{Style.RESET_ALL}'.format(
-                          recipe=recipe, Fore=Fore, Style=Style))
+                          '{version:<8}{Style.RESET_ALL}'.format(
+                              recipe=recipe, Fore=Fore, Style=Style,
+                              version=version))
                     print('    {Fore.GREEN}depends: {recipe.depends}'
                           '{Fore.RESET}'.format(recipe=recipe, Fore=Fore))
                     if recipe.conflicts:
