Cleaned up code per review comments

inclement · inclement · commit f113131d8d63 · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -627,7 +627,7 @@ def run_pymodules_install(ctx, modules):
     venv = sh.Command(ctx.virtualenv)
     with current_directory(join(ctx.build_dir)):
         shprint(venv,
-                '--python=python{}'.format(ctx.python_recipe.major_minor_version_string()),
+                '--python=python{}'.format(ctx.python_recipe.major_minor_version_string),
                 'venv')
 
         info('Creating a requirements.txt file for the Python modules')
diff --git a/pythonforandroid/recipes/hostpython3crystax/__init__.py b/pythonforandroid/recipes/hostpython3crystax/__init__.py
@@ -3,7 +3,7 @@
 import sh
 
 
-class Hostpython3Recipe(Recipe):
+class Hostpython3CrystaXRecipe(Recipe):
     version = 'auto'  # the version is taken from the python3crystax recipe
     name = 'hostpython3crystax'
 
@@ -41,4 +41,4 @@ def build_arch(self, arch):
         shprint(sh.ln, '-sf', system_python, link_dest)
 
 
-recipe = Hostpython3Recipe()
+recipe = Hostpython3CrystaXRecipe()
diff --git a/pythonforandroid/recipes/python3crystax/__init__.py b/pythonforandroid/recipes/python3crystax/__init__.py
@@ -11,7 +11,7 @@
             'releases/download/0.1/crystax_python_3.6_armeabi_armeabi-v7a.tar.gz')}
 
 
-class Python3Recipe(TargetPythonRecipe):
+class Python3CrystaXRecipe(TargetPythonRecipe):
     version = '3.6'
     url = ''
     name = 'python3crystax'
@@ -86,16 +86,16 @@ def create_python_bundle(self, dirn, arch):
                 join(dirn, 'site-packages'))
 
         info('Renaming .so files to reflect cross-compile')
-        self.reduce_object_file_names(self, join(dirn, "site-packages"))
+        self.reduce_object_file_names(join(dirn, "site-packages"))
 
         return join(dirn, 'site-packages')
 
     def include_root(self, arch_name):
-        return join(self.ctx.ndk_dir, 'sources', 'python', self.major_minor_version_string(),
+        return join(self.ctx.ndk_dir, 'sources', 'python', self.major_minor_version_string,
                     'include', 'python')
 
     def link_root(self, arch_name):
-        return join(self.ctx.ndk_dir, 'sources', 'python', self.major_minor_version_string(),
+        return join(self.ctx.ndk_dir, 'sources', 'python', self.major_minor_version_string,
                     'libs', arch_name)
 
-recipe = Python3Recipe()
+recipe = Python3CrystaXRecipe()
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -20,7 +20,6 @@ def get_recipe_env(self, arch=None):
 
         py2 = self.get_recipe('python2', arch.ctx)
         env['PYTHON2_NAME'] = py2.get_dir_name()
-        py3 = self.get_recipe('python3', arch.ctx)
 
         env['PYTHON_INCLUDE_ROOT'] = self.ctx.python_recipe.include_root(arch.arch)
         env['PYTHON_LINK_ROOT'] = self.ctx.python_recipe.link_root(arch.arch)
