🔥 Move to python3 super calls (#2106)

Co-authored-by: Alexander Taylor <alexanderjohntaylor@gmail.com>

Author: opacam

pythonforandroid/archs.py

@@ -46,7 +46,7 @@ class Arch(object):
     ]
 
     def __init__(self, ctx):
-        super(Arch, self).__init__()
+        super().__init__()
         self.ctx = ctx
 
         # Allows injecting additional linker paths used by any recipe.
@@ -309,6 +309,6 @@ class ArchAarch_64(Arch):
     # NDK r19 build system, because it seems that we don't need it anymore,
     # do we need them?
     # def get_env(self, with_flags_in_cc=True):
-    #     env = super(ArchAarch_64, self).get_env(with_flags_in_cc)
+    #     env = super().get_env(with_flags_in_cc)
     #     env['EXTRA_CFLAGS'] = self.arch_cflags[-1]
     #     return env

pythonforandroid/bootstraps/sdl2/__init__.py

@@ -49,7 +49,7 @@ def run_distribute(self):
 
         self.strip_libraries(arch)
         self.fry_eggs(site_packages_dir)
-        super(SDL2GradleBootstrap, self).run_distribute()
+        super().run_distribute()
 
 
 bootstrap = SDL2GradleBootstrap()

pythonforandroid/bootstraps/service_only/__init__.py

@@ -47,7 +47,7 @@ def run_distribute(self):
 
         self.strip_libraries(arch)
         self.fry_eggs(site_packages_dir)
-        super(ServiceOnlyBootstrap, self).run_distribute()
+        super().run_distribute()
 
 
 bootstrap = ServiceOnlyBootstrap()

pythonforandroid/bootstraps/webview/__init__.py

@@ -44,7 +44,7 @@ def run_distribute(self):
 
         self.strip_libraries(arch)
         self.fry_eggs(site_packages_dir)
-        super(WebViewBootstrap, self).run_distribute()
+        super().run_distribute()
 
 
 bootstrap = WebViewBootstrap()

pythonforandroid/build.py

@@ -435,7 +435,7 @@ def prepare_build_environment(self,
                 'python-for-android cannot continue due to the missing executables above')
 
     def __init__(self):
-        super(Context, self).__init__()
+        super().__init__()
         self.include_dirs = []
 
         self._build_env_prepared = False

pythonforandroid/logger.py

@@ -42,7 +42,7 @@ def format(self, record):
             record.msg = '{}{}[DEBUG]{}{}:   '.format(
                 Err_Style.BRIGHT, Err_Fore.LIGHTBLACK_EX, Err_Fore.RESET,
                 Err_Style.RESET_ALL) + record.msg
-        return super(LevelDifferentiatingFormatter, self).format(record)
+        return super().format(record)
 
 
 logger = logging.getLogger('p4a')

pythonforandroid/python.py

@@ -103,7 +103,7 @@ class GuestPythonRecipe(TargetPythonRecipe):
 
     def __init__(self, *args, **kwargs):
         self._ctx = None
-        super(GuestPythonRecipe, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         env = environ.copy()
@@ -216,7 +216,7 @@ def should_build(self, arch):
         return not isfile(join(self.link_root(arch.arch), self._libpython))
 
     def prebuild_arch(self, arch):
-        super(TargetPythonRecipe, self).prebuild_arch(arch)
+        super().prebuild_arch(arch)
         self.ctx.python_recipe = self
 
     def build_arch(self, arch):

pythonforandroid/recipe.py

@@ -52,7 +52,7 @@ def __new__(cls, name, bases, dct):
             if 'version' in dct:
                 dct['_version'] = dct.pop('version')
 
-        return super(RecipeMeta, cls).__new__(cls, name, bases, dct)
+        return super().__new__(cls, name, bases, dct)
 
 
 class Recipe(with_metaclass(RecipeMeta)):
@@ -769,8 +769,7 @@ def get_jni_dir(self):
         return join(self.ctx.bootstrap.build_dir, 'jni')
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True, with_python=False):
-        env = super(BootstrapNDKRecipe, self).get_recipe_env(
-            arch, with_flags_in_cc)
+        env = super().get_recipe_env(arch, with_flags_in_cc)
         if not with_python:
             return env
 
@@ -804,7 +803,7 @@ def get_jni_dir(self, arch):
         return join(self.get_build_dir(arch.arch), 'jni')
 
     def build_arch(self, arch, *extra_args):
-        super(NDKRecipe, self).build_arch(arch)
+        super().build_arch(arch)
 
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):
@@ -856,7 +855,8 @@ class PythonRecipe(Recipe):
     '''
 
     def __init__(self, *args, **kwargs):
-        super(PythonRecipe, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
+
         if 'python3' not in self.depends:
             # We ensure here that the recipe depends on python even it overrode
             # `depends`. We only do this if it doesn't already depend on any
@@ -868,7 +868,7 @@ def __init__(self, *args, **kwargs):
             self.depends = depends
 
     def clean_build(self, arch=None):
-        super(PythonRecipe, self).clean_build(arch=arch)
+        super().clean_build(arch=arch)
         name = self.folder_name
         python_install_dirs = glob.glob(join(self.ctx.python_installs_dir, '*'))
         for python_install in python_install_dirs:
@@ -905,7 +905,7 @@ def folder_name(self):
         return name
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
-        env = super(PythonRecipe, self).get_recipe_env(arch, with_flags_in_cc)
+        env = super().get_recipe_env(arch, with_flags_in_cc)
 
         env['PYTHONNOUSERSITE'] = '1'
 
@@ -950,7 +950,7 @@ def should_build(self, arch):
     def build_arch(self, arch):
         '''Install the Python module by calling setup.py install with
         the target Python dir.'''
-        super(PythonRecipe, self).build_arch(arch)
+        super().build_arch(arch)
         self.install_python_package(arch)
 
     def install_python_package(self, arch, name=None, env=None, is_dir=True):
@@ -1020,7 +1020,7 @@ def build_compiled_components(self, arch):
     def install_hostpython_package(self, arch):
         env = self.get_hostrecipe_env(arch)
         self.rebuild_compiled_components(arch, env)
-        super(CompiledComponentsPythonRecipe, self).install_hostpython_package(arch)
+        super().install_hostpython_package(arch)
 
     def rebuild_compiled_components(self, arch, env):
         info('Rebuilding compiled components in {}'.format(self.name))
@@ -1122,7 +1122,7 @@ def cythonize_build(self, env, build_dir="."):
                 self.cythonize_file(env, build_dir, join(root, filename))
 
     def get_recipe_env(self, arch, with_flags_in_cc=True):
-        env = super(CythonRecipe, self).get_recipe_env(arch, with_flags_in_cc)
+        env = super().get_recipe_env(arch, with_flags_in_cc)
         env['LDFLAGS'] = env['LDFLAGS'] + ' -L{} '.format(
             self.ctx.get_libs_dir(arch.arch) +
             ' -L{} '.format(self.ctx.libs_dir) +
@@ -1152,10 +1152,10 @@ class TargetPythonRecipe(Recipe):
 
     def __init__(self, *args, **kwargs):
         self._ctx = None
-        super(TargetPythonRecipe, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def prebuild_arch(self, arch):
-        super(TargetPythonRecipe, self).prebuild_arch(arch)
+        super().prebuild_arch(arch)
         self.ctx.python_recipe = self
 
     def include_root(self, arch):

pythonforandroid/recipes/Pillow/__init__.py

@@ -13,7 +13,7 @@ class PillowRecipe(CompiledComponentsPythonRecipe):
     call_hostpython_via_targetpython = False
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
-        env = super(PillowRecipe, self).get_recipe_env(arch, with_flags_in_cc)
+        env = super().get_recipe_env(arch, with_flags_in_cc)
 
         env['ANDROID_ROOT'] = join(self.ctx.ndk_platform, 'usr')
         ndk_lib_dir = join(self.ctx.ndk_platform, 'usr', 'lib')

pythonforandroid/recipes/android/__init__.py

@@ -18,12 +18,12 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
     config_env = {}
 
     def get_recipe_env(self, arch):
-        env = super(AndroidRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         env.update(self.config_env)
         return env
 
     def prebuild_arch(self, arch):
-        super(AndroidRecipe, self).prebuild_arch(arch)
+        super().prebuild_arch(arch)
         ctx_bootstrap = self.ctx.bootstrap.name
 
         # define macros for Cython, C, Python