🔥 Move to python3 super calls

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

@@ -104,7 +104,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()
@@ -217,7 +217,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,7 @@ class PythonRecipe(Recipe):
     '''
 
     def __init__(self, *args, **kwargs):
-        super(PythonRecipe, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if not any(
             [
                 d
@@ -874,7 +873,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:
@@ -911,7 +910,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'
 
@@ -956,7 +955,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):
@@ -1026,7 +1025,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))
@@ -1128,7 +1127,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) +
@@ -1158,10 +1157,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

@@ -19,12 +19,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

pythonforandroid/recipes/android/src/android/_android_billing.pyx

@@ -15,7 +15,7 @@ class BillingService(object):
     BILLING_TYPE_SUBSCRIPTION = 'subs'
 
     def __init__(self, callback):
-        super(BillingService, self).__init__()
+        super().__init__()
         self.callback = callback
         self.purchased_items = None
         android_billing_service_start()

pythonforandroid/recipes/android/src/android/activity.py

@@ -14,7 +14,7 @@ class NewIntentListener(PythonJavaClass):
     __javacontext__ = 'app'
 
     def __init__(self, callback, **kwargs):
-        super(NewIntentListener, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.callback = callback
 
     @java_method('(Landroid/content/Intent;)V')
@@ -27,7 +27,7 @@ class ActivityResultListener(PythonJavaClass):
     __javacontext__ = 'app'
 
     def __init__(self, callback):
-        super(ActivityResultListener, self).__init__()
+        super().__init__()
         self.callback = callback
 
     @java_method('(IILandroid/content/Intent;)V')

pythonforandroid/recipes/android/src/android/broadcast.py

@@ -20,7 +20,7 @@ def onReceive(self, context, intent):
             self.callback(context, intent)
 
     def __init__(self, callback, actions=None, categories=None):
-        super(BroadcastReceiver, self).__init__()
+        super().__init__()
         self.callback = callback
 
         if not actions and not categories:

pythonforandroid/recipes/android/src/android/runnable.py

@@ -20,7 +20,7 @@ class Runnable(PythonJavaClass):
     __runnables__ = []
 
     def __init__(self, func):
-        super(Runnable, self).__init__()
+        super().__init__()
         self.func = func
 
     def __call__(self, *args, **kwargs):

pythonforandroid/recipes/apsw/__init__.py

@@ -20,10 +20,10 @@ def build_arch(self, arch):
                     'build_ext',
                     '--enable=fts4', _env=env)
         # Install python bindings
-        super(ApswRecipe, self).build_arch(arch)
+        super().build_arch(arch)
 
     def get_recipe_env(self, arch):
-        env = super(ApswRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         sqlite_recipe = self.get_recipe('sqlite3', self.ctx)
         env['CFLAGS'] += ' -I' + sqlite_recipe.get_build_dir(arch.arch)
         env['LDFLAGS'] += ' -L' + sqlite_recipe.get_lib_dir(arch)

pythonforandroid/recipes/audiostream/__init__.py

@@ -10,7 +10,7 @@ class AudiostreamRecipe(CythonRecipe):
     depends = [('python2', 'python3'), 'sdl2', 'pyjnius']
 
     def get_recipe_env(self, arch):
-        env = super(AudiostreamRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         sdl_include = 'SDL2'
         sdl_mixer_include = 'SDL2_mixer'
         env['USE_SDL2'] = 'True'

pythonforandroid/recipes/bcrypt/__init__.py

@@ -9,7 +9,7 @@ class BCryptRecipe(CompiledComponentsPythonRecipe):
     call_hostpython_via_targetpython = False
 
     def get_recipe_env(self, arch):
-        env = super(BCryptRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
 
         openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
         env['CFLAGS'] += openssl_recipe.include_flags(arch)

pythonforandroid/recipes/boost/__init__.py

@@ -60,7 +60,7 @@ def should_build(self, arch):
         return not exists(join(self.get_build_dir(arch.arch), 'b2'))
 
     def prebuild_arch(self, arch):
-        super(BoostRecipe, self).prebuild_arch(arch)
+        super().prebuild_arch(arch)
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):
             # Set custom configuration
@@ -70,7 +70,7 @@ def prebuild_arch(self, arch):
             )
 
     def build_arch(self, arch):
-        super(BoostRecipe, self).build_arch(arch)
+        super().build_arch(arch)
         env = self.get_recipe_env(arch)
         env['PYTHON_HOST'] = self.ctx.hostpython
         with current_directory(self.get_build_dir(arch.arch)):

pythonforandroid/recipes/cdecimal/__init__.py

@@ -13,7 +13,7 @@ class CdecimalRecipe(CompiledComponentsPythonRecipe):
                'cross-compile.patch']
 
     def prebuild_arch(self, arch):
-        super(CdecimalRecipe, self).prebuild_arch(arch)
+        super().prebuild_arch(arch)
         if not is_darwin():
             if '64' in arch.arch:
                 machine = 'ansi64'

pythonforandroid/recipes/cffi/__init__.py

@@ -19,14 +19,14 @@ class CffiRecipe(CompiledComponentsPythonRecipe):
 
     def get_hostrecipe_env(self, arch=None):
         # fixes missing ffi.h on some host systems (e.g. gentoo)
-        env = super(CffiRecipe, self).get_hostrecipe_env(arch)
+        env = super().get_hostrecipe_env(arch)
         libffi = self.get_recipe('libffi', self.ctx)
         includes = libffi.get_include_dirs(arch)
         env['FFI_INC'] = ",".join(includes)
         return env
 
     def get_recipe_env(self, arch=None):
-        env = super(CffiRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         libffi = self.get_recipe('libffi', self.ctx)
         includes = libffi.get_include_dirs(arch)
         env['CFLAGS'] = ' -I'.join([env.get('CFLAGS', '')] + includes)

pythonforandroid/recipes/cryptography/__init__.py

@@ -10,7 +10,7 @@ class CryptographyRecipe(CompiledComponentsPythonRecipe):
     call_hostpython_via_targetpython = False
 
     def get_recipe_env(self, arch):
-        env = super(CryptographyRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
 
         openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
         env['CFLAGS'] += openssl_recipe.include_flags(arch)

pythonforandroid/recipes/enum34/__init__.py

@@ -16,7 +16,7 @@ def should_build(self, arch):
             # attribute `depends` because otherwise we will not be able to
             # build the cryptography recipe.
             return False
-        return super(Enum34Recipe, self).should_build(arch)
+        return super().should_build(arch)
 
 
 recipe = Enum34Recipe()

pythonforandroid/recipes/evdev/__init__.py

@@ -17,7 +17,7 @@ class EvdevRecipe(CompiledComponentsPythonRecipe):
                'evdev-permissions.patch']
 
     def get_recipe_env(self, arch=None):
-        env = super(EvdevRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         env['NDKPLATFORM'] = self.ctx.ndk_platform
         return env
 

pythonforandroid/recipes/ffmpeg/__init__.py

@@ -19,7 +19,7 @@ def prebuild_arch(self, arch):
         self.apply_patches(arch)
 
     def get_recipe_env(self, arch):
-        env = super(FFMpegRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         env['NDK'] = self.ctx.ndk_dir
         return env
 

pythonforandroid/recipes/ffpyplayer/__init__.py

@@ -10,7 +10,7 @@ class FFPyPlayerRecipe(CythonRecipe):
     opt_depends = ['openssl', 'ffpyplayer_codecs']
 
     def get_recipe_env(self, arch, with_flags_in_cc=True):
-        env = super(FFPyPlayerRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
 
         build_dir = Recipe.get_recipe('ffmpeg', self.ctx).get_build_dir(arch.arch)
         env["FFMPEG_INCLUDE_DIR"] = join(build_dir, "include")

pythonforandroid/recipes/freetype/__init__.py

@@ -29,7 +29,7 @@ class FreetypeRecipe(Recipe):
     built_libraries = {'libfreetype.so': 'objs/.libs'}
 
     def get_recipe_env(self, arch=None, with_harfbuzz=False):
-        env = super(FreetypeRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         if with_harfbuzz:
             harfbuzz_build = self.get_recipe(
                 'harfbuzz', self.ctx

pythonforandroid/recipes/genericndkbuild/__init__.py

@@ -14,8 +14,10 @@ def should_build(self, arch):
         return True
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True, with_python=True):
-        env = super(GenericNDKBuildRecipe, self).get_recipe_env(
-            arch=arch, with_flags_in_cc=with_flags_in_cc, with_python=with_python)
+        env = super().get_recipe_env(
+            arch=arch, with_flags_in_cc=with_flags_in_cc,
+            with_python=with_python,
+        )
         env['APP_ALLOW_MISSING_DEPS'] = 'true'
         return env
 

pythonforandroid/recipes/harfbuzz/__init__.py

@@ -26,7 +26,7 @@ class HarfbuzzRecipe(Recipe):
     built_libraries = {'libharfbuzz.so': 'src/.libs'}
 
     def get_recipe_env(self, arch=None):
-        env = super(HarfbuzzRecipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         if 'freetype' in self.ctx.recipe_build_order:
             freetype = self.get_recipe('freetype', self.ctx)
             freetype_install = join(