From fd3689755652867b0774c123fa53b0bdacf94efa Mon Sep 17 00:00:00 2001 From: opacam Date: Sat, 28 Mar 2020 10:48:58 +0100 Subject: [PATCH] :fire: Move to python3 `super` calls --- pythonforandroid/archs.py | 4 ++-- pythonforandroid/bootstraps/sdl2/__init__.py | 2 +- .../bootstraps/service_only/__init__.py | 2 +- .../bootstraps/webview/__init__.py | 2 +- pythonforandroid/build.py | 2 +- pythonforandroid/logger.py | 2 +- pythonforandroid/python.py | 4 ++-- pythonforandroid/recipe.py | 23 +++++++++---------- pythonforandroid/recipes/Pillow/__init__.py | 2 +- pythonforandroid/recipes/android/__init__.py | 4 ++-- .../android/src/android/_android_billing.pyx | 2 +- .../recipes/android/src/android/activity.py | 4 ++-- .../recipes/android/src/android/broadcast.py | 2 +- .../recipes/android/src/android/runnable.py | 2 +- pythonforandroid/recipes/apsw/__init__.py | 4 ++-- .../recipes/audiostream/__init__.py | 2 +- pythonforandroid/recipes/bcrypt/__init__.py | 2 +- pythonforandroid/recipes/boost/__init__.py | 4 ++-- pythonforandroid/recipes/cdecimal/__init__.py | 2 +- pythonforandroid/recipes/cffi/__init__.py | 4 ++-- .../recipes/cryptography/__init__.py | 2 +- pythonforandroid/recipes/enum34/__init__.py | 2 +- pythonforandroid/recipes/evdev/__init__.py | 2 +- pythonforandroid/recipes/ffmpeg/__init__.py | 2 +- .../recipes/ffpyplayer/__init__.py | 2 +- pythonforandroid/recipes/freetype/__init__.py | 2 +- .../recipes/genericndkbuild/__init__.py | 6 +++-- pythonforandroid/recipes/harfbuzz/__init__.py | 2 +- pythonforandroid/recipes/icu/__init__.py | 2 +- pythonforandroid/recipes/kivy/__init__.py | 6 ++--- .../recipes/libmysqlclient/__init__.py | 2 +- .../recipes/libsodium/__init__.py | 2 +- .../recipes/libtorrent/__init__.py | 4 ++-- .../recipes/libvorbis/__init__.py | 2 +- pythonforandroid/recipes/libxml2/__init__.py | 2 +- pythonforandroid/recipes/libxslt/__init__.py | 2 +- pythonforandroid/recipes/libzbar/__init__.py | 2 +- pythonforandroid/recipes/lxml/__init__.py | 4 ++-- pythonforandroid/recipes/m2crypto/__init__.py | 2 +- pythonforandroid/recipes/mysqldb/__init__.py | 4 ++-- pythonforandroid/recipes/opencv/__init__.py | 2 +- pythonforandroid/recipes/openssl/__init__.py | 2 +- pythonforandroid/recipes/pandas/__init__.py | 2 +- pythonforandroid/recipes/pil/__init__.py | 2 +- .../recipes/protobuf_cpp/__init__.py | 4 ++-- pythonforandroid/recipes/psycopg2/__init__.py | 2 +- pythonforandroid/recipes/pycrypto/__init__.py | 4 ++-- pythonforandroid/recipes/pyicu/__init__.py | 2 +- pythonforandroid/recipes/pyjnius/__init__.py | 2 +- .../recipes/pyleveldb/__init__.py | 2 +- pythonforandroid/recipes/pymunk/__init__.py | 2 +- pythonforandroid/recipes/pynacl/__init__.py | 2 +- pythonforandroid/recipes/pysha3/__init__.py | 2 +- pythonforandroid/recipes/python3/__init__.py | 2 +- pythonforandroid/recipes/pyzbar/__init__.py | 2 +- pythonforandroid/recipes/pyzmq/__init__.py | 4 ++-- .../recipes/reportlab/__init__.py | 2 +- pythonforandroid/recipes/scrypt/__init__.py | 2 +- pythonforandroid/recipes/sdl2/__init__.py | 2 +- .../recipes/secp256k1/__init__.py | 2 +- pythonforandroid/recipes/shapely/__init__.py | 2 +- pythonforandroid/recipes/sqlite3/__init__.py | 6 ++--- pythonforandroid/recipes/twisted/__init__.py | 4 ++-- pythonforandroid/recipes/vlc/__init__.py | 4 ++-- pythonforandroid/recipes/zbar/__init__.py | 2 +- .../recipes/zbarlight/__init__.py | 2 +- pythonforandroid/recipes/zope/__init__.py | 4 ++-- .../recipes/zope_interface/__init__.py | 4 ++-- pythonforandroid/util.py | 2 +- tests/test_recipe.py | 4 ++-- 70 files changed, 105 insertions(+), 104 deletions(-) diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py index 50dce55cb9..fb991eacf0 100644 --- a/pythonforandroid/archs.py +++ b/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 diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py index dde5f7f79b..fec0fd5da9 100644 --- a/pythonforandroid/bootstraps/sdl2/__init__.py +++ b/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() diff --git a/pythonforandroid/bootstraps/service_only/__init__.py b/pythonforandroid/bootstraps/service_only/__init__.py index 2175f8b61f..cc9def0cb7 100644 --- a/pythonforandroid/bootstraps/service_only/__init__.py +++ b/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() diff --git a/pythonforandroid/bootstraps/webview/__init__.py b/pythonforandroid/bootstraps/webview/__init__.py index c59c158356..ba3ffbe673 100644 --- a/pythonforandroid/bootstraps/webview/__init__.py +++ b/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() diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py index 8f0ac40a82..f19ddc9e96 100644 --- a/pythonforandroid/build.py +++ b/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 diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py index 77cb9da323..193356a2a8 100644 --- a/pythonforandroid/logger.py +++ b/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') diff --git a/pythonforandroid/python.py b/pythonforandroid/python.py index 9c8b2439a2..c2bb346d68 100755 --- a/pythonforandroid/python.py +++ b/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): diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py index 3d814d5c4e..fe7763be22 100644 --- a/pythonforandroid/recipe.py +++ b/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): diff --git a/pythonforandroid/recipes/Pillow/__init__.py b/pythonforandroid/recipes/Pillow/__init__.py index 22289463a1..dbf4b01909 100644 --- a/pythonforandroid/recipes/Pillow/__init__.py +++ b/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') diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py index 3658c772ba..2c7d5146fd 100644 --- a/pythonforandroid/recipes/android/__init__.py +++ b/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 diff --git a/pythonforandroid/recipes/android/src/android/_android_billing.pyx b/pythonforandroid/recipes/android/src/android/_android_billing.pyx index bd6bb2ef7f..d5ed2a00d0 100644 --- a/pythonforandroid/recipes/android/src/android/_android_billing.pyx +++ b/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() diff --git a/pythonforandroid/recipes/android/src/android/activity.py b/pythonforandroid/recipes/android/src/android/activity.py index cafbbdab70..9c215075c6 100644 --- a/pythonforandroid/recipes/android/src/android/activity.py +++ b/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') diff --git a/pythonforandroid/recipes/android/src/android/broadcast.py b/pythonforandroid/recipes/android/src/android/broadcast.py index cb34cd9d19..aa454b7c13 100644 --- a/pythonforandroid/recipes/android/src/android/broadcast.py +++ b/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: diff --git a/pythonforandroid/recipes/android/src/android/runnable.py b/pythonforandroid/recipes/android/src/android/runnable.py index 8d2d1161d1..aa5756d43a 100644 --- a/pythonforandroid/recipes/android/src/android/runnable.py +++ b/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): diff --git a/pythonforandroid/recipes/apsw/__init__.py b/pythonforandroid/recipes/apsw/__init__.py index 6098e4b98c..0a224cf7d6 100644 --- a/pythonforandroid/recipes/apsw/__init__.py +++ b/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) diff --git a/pythonforandroid/recipes/audiostream/__init__.py b/pythonforandroid/recipes/audiostream/__init__.py index 518d1dda8e..7d52b9c503 100644 --- a/pythonforandroid/recipes/audiostream/__init__.py +++ b/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' diff --git a/pythonforandroid/recipes/bcrypt/__init__.py b/pythonforandroid/recipes/bcrypt/__init__.py index e7a5659b8f..da220ff30d 100644 --- a/pythonforandroid/recipes/bcrypt/__init__.py +++ b/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) diff --git a/pythonforandroid/recipes/boost/__init__.py b/pythonforandroid/recipes/boost/__init__.py index 978ab6f5b0..9ac0d46078 100644 --- a/pythonforandroid/recipes/boost/__init__.py +++ b/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)): diff --git a/pythonforandroid/recipes/cdecimal/__init__.py b/pythonforandroid/recipes/cdecimal/__init__.py index 94929c7807..a444eb1b25 100644 --- a/pythonforandroid/recipes/cdecimal/__init__.py +++ b/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' diff --git a/pythonforandroid/recipes/cffi/__init__.py b/pythonforandroid/recipes/cffi/__init__.py index aa291dca46..e2a3b57f45 100644 --- a/pythonforandroid/recipes/cffi/__init__.py +++ b/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) diff --git a/pythonforandroid/recipes/cryptography/__init__.py b/pythonforandroid/recipes/cryptography/__init__.py index 1b7babafca..19c8f0d645 100644 --- a/pythonforandroid/recipes/cryptography/__init__.py +++ b/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) diff --git a/pythonforandroid/recipes/enum34/__init__.py b/pythonforandroid/recipes/enum34/__init__.py index 9a438c5503..35dcda9a9f 100644 --- a/pythonforandroid/recipes/enum34/__init__.py +++ b/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() diff --git a/pythonforandroid/recipes/evdev/__init__.py b/pythonforandroid/recipes/evdev/__init__.py index afd542e2a0..2d53f9b0b8 100644 --- a/pythonforandroid/recipes/evdev/__init__.py +++ b/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 diff --git a/pythonforandroid/recipes/ffmpeg/__init__.py b/pythonforandroid/recipes/ffmpeg/__init__.py index 3418ed1a90..b5e5605a1d 100644 --- a/pythonforandroid/recipes/ffmpeg/__init__.py +++ b/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 diff --git a/pythonforandroid/recipes/ffpyplayer/__init__.py b/pythonforandroid/recipes/ffpyplayer/__init__.py index cb9e7071e7..73c4b5a2de 100644 --- a/pythonforandroid/recipes/ffpyplayer/__init__.py +++ b/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") diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py index cf8de5ee85..4075ac8a33 100644 --- a/pythonforandroid/recipes/freetype/__init__.py +++ b/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 diff --git a/pythonforandroid/recipes/genericndkbuild/__init__.py b/pythonforandroid/recipes/genericndkbuild/__init__.py index e6cccb6e8d..f17a767969 100644 --- a/pythonforandroid/recipes/genericndkbuild/__init__.py +++ b/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 diff --git a/pythonforandroid/recipes/harfbuzz/__init__.py b/pythonforandroid/recipes/harfbuzz/__init__.py index 17c72a27e2..9f1a25de6a 100644 --- a/pythonforandroid/recipes/harfbuzz/__init__.py +++ b/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( diff --git a/pythonforandroid/recipes/icu/__init__.py b/pythonforandroid/recipes/icu/__init__.py index 43c5ac9eb8..c085f88c83 100644 --- a/pythonforandroid/recipes/icu/__init__.py +++ b/pythonforandroid/recipes/icu/__init__.py @@ -109,7 +109,7 @@ def make_build_dest(dest): shprint(sh.make, "install", _env=env) def install_libraries(self, arch): - super(ICURecipe, self).install_libraries(arch) + super().install_libraries(arch) src_include = join( self.get_build_dir(arch.arch), "icu_build", "include") diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py index a93627a021..0e01a91d6a 100644 --- a/pythonforandroid/recipes/kivy/__init__.py +++ b/pythonforandroid/recipes/kivy/__init__.py @@ -14,7 +14,7 @@ class KivyRecipe(CythonRecipe): python_depends = ['certifi'] def cythonize_build(self, env, build_dir='.'): - super(KivyRecipe, self).cythonize_build(env, build_dir=build_dir) + super().cythonize_build(env, build_dir=build_dir) if not exists(join(build_dir, 'kivy', 'include')): return @@ -35,10 +35,10 @@ def cythonize_file(self, env, build_dir, filename): do_not_cythonize = ['window_x11.pyx', ] if basename(filename) in do_not_cythonize: return - super(KivyRecipe, self).cythonize_file(env, build_dir, filename) + super().cythonize_file(env, build_dir, filename) def get_recipe_env(self, arch): - env = super(KivyRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) if 'sdl2' in self.ctx.recipe_build_order: env['USE_SDL2'] = '1' env['KIVY_SPLIT_EXAMPLES'] = '1' diff --git a/pythonforandroid/recipes/libmysqlclient/__init__.py b/pythonforandroid/recipes/libmysqlclient/__init__.py index 9235ad4325..31ebd3c540 100644 --- a/pythonforandroid/recipes/libmysqlclient/__init__.py +++ b/pythonforandroid/recipes/libmysqlclient/__init__.py @@ -38,7 +38,7 @@ def build_arch(self, arch): self.install_libs(arch, join('libmysql', 'libmysql.so')) # def get_recipe_env(self, arch=None): - # env = super(LibmysqlclientRecipe, self).get_recipe_env(arch) + # env = super().get_recipe_env(arch) # env['WITHOUT_SERVER'] = 'ON' # ncurses = self.get_recipe('ncurses', self) # # env['CFLAGS'] += ' -I' + join(ncurses.get_build_dir(arch.arch), diff --git a/pythonforandroid/recipes/libsodium/__init__.py b/pythonforandroid/recipes/libsodium/__init__.py index 8165ebc57e..f66fc18e7f 100644 --- a/pythonforandroid/recipes/libsodium/__init__.py +++ b/pythonforandroid/recipes/libsodium/__init__.py @@ -27,7 +27,7 @@ def build_arch(self, arch): shprint(sh.make, '-j', str(cpu_count()), _env=env) def get_recipe_env(self, arch): - env = super(LibsodiumRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['CFLAGS'] += ' -Os' return env diff --git a/pythonforandroid/recipes/libtorrent/__init__.py b/pythonforandroid/recipes/libtorrent/__init__.py index 0eb50672b7..b9debc2175 100644 --- a/pythonforandroid/recipes/libtorrent/__init__.py +++ b/pythonforandroid/recipes/libtorrent/__init__.py @@ -61,14 +61,14 @@ def should_build(self, arch): self.ctx.has_package('libtorrent', arch.arch)) def prebuild_arch(self, arch): - super(LibtorrentRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) if 'openssl' in recipe.ctx.recipe_build_order: # Patch boost user-config.jam to use openssl self.get_recipe('boost', self.ctx).apply_patch( join(self.get_recipe_dir(), 'user-config-openssl.patch'), arch.arch) def build_arch(self, arch): - super(LibtorrentRecipe, self).build_arch(arch) + super().build_arch(arch) env = self.get_recipe_env(arch) env['PYTHON_HOST'] = self.ctx.hostpython diff --git a/pythonforandroid/recipes/libvorbis/__init__.py b/pythonforandroid/recipes/libvorbis/__init__.py index 87c7a449db..5f1e3254c1 100644 --- a/pythonforandroid/recipes/libvorbis/__init__.py +++ b/pythonforandroid/recipes/libvorbis/__init__.py @@ -12,7 +12,7 @@ class VorbisRecipe(NDKRecipe): generated_libraries = ['libvorbis.so', 'libvorbisfile.so', 'libvorbisenc.so'] def get_recipe_env(self, arch=None): - env = super(VorbisRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) ogg = self.get_recipe('libogg', self.ctx) env['CFLAGS'] += ' -I{}'.format(join(ogg.get_build_dir(arch.arch), 'include')) return env diff --git a/pythonforandroid/recipes/libxml2/__init__.py b/pythonforandroid/recipes/libxml2/__init__.py index bcccc4ebd8..c8788d9d78 100644 --- a/pythonforandroid/recipes/libxml2/__init__.py +++ b/pythonforandroid/recipes/libxml2/__init__.py @@ -43,7 +43,7 @@ def build_arch(self, arch): shprint(sh.make, "libxml2.la", _env=env) def get_recipe_env(self, arch): - env = super(Libxml2Recipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['CONFIG_SHELL'] = '/bin/bash' env['SHELL'] = '/bin/bash' env['CC'] += ' -I' + self.get_build_dir(arch.arch) diff --git a/pythonforandroid/recipes/libxslt/__init__.py b/pythonforandroid/recipes/libxslt/__init__.py index b22e2b328a..ca65fbb9d8 100644 --- a/pythonforandroid/recipes/libxslt/__init__.py +++ b/pythonforandroid/recipes/libxslt/__init__.py @@ -45,7 +45,7 @@ def build_arch(self, arch): shprint(sh.make, "V=1", _env=env) def get_recipe_env(self, arch): - env = super(LibxsltRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['CONFIG_SHELL'] = '/bin/bash' env['SHELL'] = '/bin/bash' diff --git a/pythonforandroid/recipes/libzbar/__init__.py b/pythonforandroid/recipes/libzbar/__init__.py index 5b1b62d8c1..7a9c15650d 100644 --- a/pythonforandroid/recipes/libzbar/__init__.py +++ b/pythonforandroid/recipes/libzbar/__init__.py @@ -19,7 +19,7 @@ class LibZBarRecipe(Recipe): built_libraries = {'libzbar.so': 'zbar/.libs'} def get_recipe_env(self, arch=None, with_flags_in_cc=True): - env = super(LibZBarRecipe, self).get_recipe_env(arch, with_flags_in_cc) + env = super().get_recipe_env(arch, with_flags_in_cc) libiconv = self.get_recipe('libiconv', self.ctx) libiconv_dir = libiconv.get_build_dir(arch.arch) env['CFLAGS'] += ' -I' + os.path.join(libiconv_dir, 'include') diff --git a/pythonforandroid/recipes/lxml/__init__.py b/pythonforandroid/recipes/lxml/__init__.py index 6d4b91c25b..75e7fcd9f7 100644 --- a/pythonforandroid/recipes/lxml/__init__.py +++ b/pythonforandroid/recipes/lxml/__init__.py @@ -12,7 +12,7 @@ class LXMLRecipe(CompiledComponentsPythonRecipe): call_hostpython_via_targetpython = False # Due to setuptools def should_build(self, arch): - super(LXMLRecipe, self).should_build(arch) + super().should_build(arch) py_ver = self.ctx.python_recipe.major_minor_version_string build_platform = '{system}-{machine}'.format( @@ -24,7 +24,7 @@ def should_build(self, arch): return not all([exists(join(build_dir, lib)) for lib in py_libs]) def get_recipe_env(self, arch): - env = super(LXMLRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) # libxslt flags libxslt_recipe = Recipe.get_recipe('libxslt', self.ctx) diff --git a/pythonforandroid/recipes/m2crypto/__init__.py b/pythonforandroid/recipes/m2crypto/__init__.py index 653eeca85c..57860493e2 100644 --- a/pythonforandroid/recipes/m2crypto/__init__.py +++ b/pythonforandroid/recipes/m2crypto/__init__.py @@ -32,7 +32,7 @@ def build_compiled_components(self, arch): env['STRIP'], '{}', ';', _env=env) def get_recipe_env(self, arch): - env = super(M2CryptoRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['OPENSSL_BUILD_PATH'] = self.get_recipe('openssl', self.ctx).get_build_dir(arch.arch) return env diff --git a/pythonforandroid/recipes/mysqldb/__init__.py b/pythonforandroid/recipes/mysqldb/__init__.py index f08458567b..287152d627 100644 --- a/pythonforandroid/recipes/mysqldb/__init__.py +++ b/pythonforandroid/recipes/mysqldb/__init__.py @@ -23,13 +23,13 @@ def convert_newlines(self, filename): f.write(data.replace(b'\r\n', b'\n').replace(b'\r', b'\n')) def prebuild_arch(self, arch): - super(MysqldbRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) setupbase = join(self.get_build_dir(arch.arch), 'setup') self.convert_newlines(setupbase + '.py') self.convert_newlines(setupbase + '_posix.py') def get_recipe_env(self, arch=None): - env = super(MysqldbRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) hostpython = self.get_recipe('hostpython2', self.ctx) # TODO: fix hardcoded path diff --git a/pythonforandroid/recipes/opencv/__init__.py b/pythonforandroid/recipes/opencv/__init__.py index e52c20de28..a57089920f 100644 --- a/pythonforandroid/recipes/opencv/__init__.py +++ b/pythonforandroid/recipes/opencv/__init__.py @@ -38,7 +38,7 @@ def get_lib_dir(self, arch): return join(self.get_build_dir(arch.arch), 'build', 'lib', arch.arch) def get_recipe_env(self, arch): - env = super(OpenCVRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['ANDROID_NDK'] = self.ctx.ndk_dir env['ANDROID_SDK'] = self.ctx.sdk_dir return env diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py index a2ecb2c549..0f9f08314b 100644 --- a/pythonforandroid/recipes/openssl/__init__.py +++ b/pythonforandroid/recipes/openssl/__init__.py @@ -93,7 +93,7 @@ def link_flags(self, arch): return self.link_dirs_flags(arch) + self.link_libs_flags() def get_recipe_env(self, arch=None): - env = super(OpenSSLRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['OPENSSL_VERSION'] = self.version env['MAKE'] = 'make' # This removes the '-j5', which isn't safe env['ANDROID_NDK'] = self.ctx.ndk_dir diff --git a/pythonforandroid/recipes/pandas/__init__.py b/pythonforandroid/recipes/pandas/__init__.py index 7999d02402..37c24b0a8f 100644 --- a/pythonforandroid/recipes/pandas/__init__.py +++ b/pythonforandroid/recipes/pandas/__init__.py @@ -16,7 +16,7 @@ class PandasRecipe(CppCompiledComponentsPythonRecipe): call_hostpython_via_targetpython = False def get_recipe_env(self, arch): - env = super(PandasRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) # we need the includes from our installed numpy at site packages # because we need some includes generated at numpy's compile time env['NUMPY_INCLUDES'] = join( diff --git a/pythonforandroid/recipes/pil/__init__.py b/pythonforandroid/recipes/pil/__init__.py index 92f633714f..46bace12b7 100644 --- a/pythonforandroid/recipes/pil/__init__.py +++ b/pythonforandroid/recipes/pil/__init__.py @@ -17,7 +17,7 @@ def build_arch(self, arch): 'This should be a drop-in replacement.') warning('It is recommended to change "pil" to "pillow" in your requirements, ' 'to ensure future compatibility') - super(PilRecipe, self).build_arch(arch) + super().build_arch(arch) recipe = PilRecipe() diff --git a/pythonforandroid/recipes/protobuf_cpp/__init__.py b/pythonforandroid/recipes/protobuf_cpp/__init__.py index 36f73def13..9bde198376 100644 --- a/pythonforandroid/recipes/protobuf_cpp/__init__.py +++ b/pythonforandroid/recipes/protobuf_cpp/__init__.py @@ -25,7 +25,7 @@ class ProtobufCppRecipe(CppCompiledComponentsPythonRecipe): protoc_dir = None def prebuild_arch(self, arch): - super(ProtobufCppRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) patch_mark = join(self.get_build_dir(arch.arch), '.protobuf-patched') if self.ctx.python_recipe.name == 'python3' and not exists(patch_mark): @@ -129,7 +129,7 @@ def install_python_package(self, arch): ).close() def get_recipe_env(self, arch): - env = super(ProtobufCppRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) if self.protoc_dir is not None: # we need protoc with binary for host platform env['PROTOC'] = join(self.protoc_dir, 'bin', 'protoc') diff --git a/pythonforandroid/recipes/psycopg2/__init__.py b/pythonforandroid/recipes/psycopg2/__init__.py index fd15790f96..20187ead47 100644 --- a/pythonforandroid/recipes/psycopg2/__init__.py +++ b/pythonforandroid/recipes/psycopg2/__init__.py @@ -26,7 +26,7 @@ def prebuild_arch(self, arch): 'setup.py') def get_recipe_env(self, arch): - env = super(Psycopg2Recipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['LDFLAGS'] = "{} -L{}".format(env['LDFLAGS'], self.ctx.get_libs_dir(arch.arch)) env['EXTRA_CFLAGS'] = "--host linux-armv" return env diff --git a/pythonforandroid/recipes/pycrypto/__init__.py b/pythonforandroid/recipes/pycrypto/__init__.py index 8f70df28e9..230d5e7dd4 100644 --- a/pythonforandroid/recipes/pycrypto/__init__.py +++ b/pythonforandroid/recipes/pycrypto/__init__.py @@ -16,7 +16,7 @@ class PyCryptoRecipe(CompiledComponentsPythonRecipe): patches = ['add_length.patch'] def get_recipe_env(self, arch=None): - env = super(PyCryptoRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) openssl_recipe = Recipe.get_recipe('openssl', self.ctx) env['CC'] = env['CC'] + openssl_recipe.include_flags(arch) @@ -38,7 +38,7 @@ def build_compiled_components(self, arch): shprint(configure, '--host=arm-eabi', '--prefix={}'.format(self.ctx.get_python_install_dir()), '--enable-shared', _env=env) - super(PyCryptoRecipe, self).build_compiled_components(arch) + super().build_compiled_components(arch) recipe = PyCryptoRecipe() diff --git a/pythonforandroid/recipes/pyicu/__init__.py b/pythonforandroid/recipes/pyicu/__init__.py index 37969079f8..17b7c619b3 100644 --- a/pythonforandroid/recipes/pyicu/__init__.py +++ b/pythonforandroid/recipes/pyicu/__init__.py @@ -10,7 +10,7 @@ class PyICURecipe(CppCompiledComponentsPythonRecipe): patches = ['locale.patch'] def get_recipe_env(self, arch): - env = super(PyICURecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) icu_include = join( self.ctx.get_python_install_dir(), "include", "icu") diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py index 12f3717872..206d851a7f 100644 --- a/pythonforandroid/recipes/pyjnius/__init__.py +++ b/pythonforandroid/recipes/pyjnius/__init__.py @@ -18,7 +18,7 @@ class PyjniusRecipe(CythonRecipe): ('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))] def postbuild_arch(self, arch): - super(PyjniusRecipe, self).postbuild_arch(arch) + super().postbuild_arch(arch) info('Copying pyjnius java class to classes build dir') with current_directory(self.get_build_dir(arch.arch)): shprint(sh.cp, '-a', join('jnius', 'src', 'org'), self.ctx.javaclass_dir) diff --git a/pythonforandroid/recipes/pyleveldb/__init__.py b/pythonforandroid/recipes/pyleveldb/__init__.py index 60b86bb18b..54dfb64657 100644 --- a/pythonforandroid/recipes/pyleveldb/__init__.py +++ b/pythonforandroid/recipes/pyleveldb/__init__.py @@ -10,7 +10,7 @@ class PyLevelDBRecipe(CppCompiledComponentsPythonRecipe): site_packages_name = 'leveldb' def get_recipe_env(self, arch): - env = super(PyLevelDBRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) snappy_recipe = self.get_recipe('snappy', self.ctx) leveldb_recipe = self.get_recipe('leveldb', self.ctx) diff --git a/pythonforandroid/recipes/pymunk/__init__.py b/pythonforandroid/recipes/pymunk/__init__.py index 5f027ab0fb..391ae9b743 100644 --- a/pythonforandroid/recipes/pymunk/__init__.py +++ b/pythonforandroid/recipes/pymunk/__init__.py @@ -10,7 +10,7 @@ class PymunkRecipe(CompiledComponentsPythonRecipe): call_hostpython_via_targetpython = False def get_recipe_env(self, arch): - env = super(PymunkRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() env['LDFLAGS'] += " -shared -llog" env['LDFLAGS'] += ' -L{}'.format(join(self.ctx.ndk_platform, 'usr', 'lib')) diff --git a/pythonforandroid/recipes/pynacl/__init__.py b/pythonforandroid/recipes/pynacl/__init__.py index eb9ca2df50..b7f661ffcb 100644 --- a/pythonforandroid/recipes/pynacl/__init__.py +++ b/pythonforandroid/recipes/pynacl/__init__.py @@ -11,7 +11,7 @@ class PyNaCLRecipe(CompiledComponentsPythonRecipe): call_hostpython_via_targetpython = False def get_recipe_env(self, arch): - env = super(PyNaCLRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['SODIUM_INSTALL'] = 'system' libsodium_build_dir = self.get_recipe( diff --git a/pythonforandroid/recipes/pysha3/__init__.py b/pythonforandroid/recipes/pysha3/__init__.py index c171c3f662..af389460ff 100644 --- a/pythonforandroid/recipes/pysha3/__init__.py +++ b/pythonforandroid/recipes/pysha3/__init__.py @@ -10,7 +10,7 @@ class Pysha3Recipe(PythonRecipe): call_hostpython_via_targetpython = False def get_recipe_env(self, arch=None, with_flags_in_cc=True): - env = super(Pysha3Recipe, self).get_recipe_env(arch, with_flags_in_cc) + env = super().get_recipe_env(arch, with_flags_in_cc) # CFLAGS may only be used to specify C compiler flags, for macro definitions use CPPFLAGS env['CPPFLAGS'] = env['CFLAGS'] env['CFLAGS'] = '' diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py index c80875ccc3..3642584c05 100644 --- a/pythonforandroid/recipes/python3/__init__.py +++ b/pythonforandroid/recipes/python3/__init__.py @@ -73,7 +73,7 @@ class Python3Recipe(GuestPythonRecipe): '--exec-prefix={exec_prefix}') def set_libs_flags(self, env, arch): - env = super(Python3Recipe, self).set_libs_flags(env, arch) + env = super().set_libs_flags(env, arch) if 'openssl' in self.ctx.recipe_build_order: recipe = Recipe.get_recipe('openssl', self.ctx) self.configure_args += \ diff --git a/pythonforandroid/recipes/pyzbar/__init__.py b/pythonforandroid/recipes/pyzbar/__init__.py index ccfcd9b2ea..32aaf89185 100644 --- a/pythonforandroid/recipes/pyzbar/__init__.py +++ b/pythonforandroid/recipes/pyzbar/__init__.py @@ -13,7 +13,7 @@ class PyZBarRecipe(PythonRecipe): depends = ['setuptools', 'libzbar'] def get_recipe_env(self, arch=None, with_flags_in_cc=True): - env = super(PyZBarRecipe, self).get_recipe_env(arch, with_flags_in_cc) + env = super().get_recipe_env(arch, with_flags_in_cc) libzbar = self.get_recipe('libzbar', self.ctx) libzbar_dir = libzbar.get_build_dir(arch.arch) env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() diff --git a/pythonforandroid/recipes/pyzmq/__init__.py b/pythonforandroid/recipes/pyzmq/__init__.py index 02b2a406a9..d113840aff 100644 --- a/pythonforandroid/recipes/pyzmq/__init__.py +++ b/pythonforandroid/recipes/pyzmq/__init__.py @@ -19,7 +19,7 @@ class PyZMQRecipe(CythonRecipe): '-Izmq/devices'] def get_recipe_env(self, arch=None): - env = super(PyZMQRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) # TODO: fix hardcoded path # This is required to prevent issue with _io.so import. # hostpython = self.get_recipe('hostpython2', self.ctx) @@ -45,7 +45,7 @@ def build_cython_components(self, arch): skip_check_zmq = True """.format(libzmq_prefix).encode()) - return super(PyZMQRecipe, self).build_cython_components(arch) + return super().build_cython_components(arch) with current_directory(self.get_build_dir(arch.arch)): hostpython = sh.Command(self.hostpython_location) diff --git a/pythonforandroid/recipes/reportlab/__init__.py b/pythonforandroid/recipes/reportlab/__init__.py index d5e8001e46..574f26c67b 100644 --- a/pythonforandroid/recipes/reportlab/__init__.py +++ b/pythonforandroid/recipes/reportlab/__init__.py @@ -13,7 +13,7 @@ class ReportLabRecipe(CompiledComponentsPythonRecipe): def prebuild_arch(self, arch): if not self.is_patched(arch): - super(ReportLabRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) recipe_dir = self.get_build_dir(arch.arch) # Some versions of reportlab ship with a GPL-licensed font. diff --git a/pythonforandroid/recipes/scrypt/__init__.py b/pythonforandroid/recipes/scrypt/__init__.py index 26b8048a05..7f235396a0 100644 --- a/pythonforandroid/recipes/scrypt/__init__.py +++ b/pythonforandroid/recipes/scrypt/__init__.py @@ -13,7 +13,7 @@ def get_recipe_env(self, arch, with_flags_in_cc=True): """ Adds openssl recipe to include and library path. """ - env = super(ScryptRecipe, self).get_recipe_env(arch, with_flags_in_cc) + env = super().get_recipe_env(arch, with_flags_in_cc) openssl_recipe = self.get_recipe('openssl', self.ctx) env['CFLAGS'] += openssl_recipe.include_flags(arch) env['LDFLAGS'] += ' -L{}'.format(self.ctx.get_libs_dir(arch.arch)) diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py index 00345e89a5..b39f62547c 100644 --- a/pythonforandroid/recipes/sdl2/__init__.py +++ b/pythonforandroid/recipes/sdl2/__init__.py @@ -13,7 +13,7 @@ class LibSDL2Recipe(BootstrapNDKRecipe): depends = ['sdl2_image', 'sdl2_mixer', 'sdl2_ttf'] def get_recipe_env(self, arch=None, with_flags_in_cc=True, with_python=True): - env = super(LibSDL2Recipe, self).get_recipe_env( + 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 diff --git a/pythonforandroid/recipes/secp256k1/__init__.py b/pythonforandroid/recipes/secp256k1/__init__.py index 338c7b90c3..e72dee4959 100644 --- a/pythonforandroid/recipes/secp256k1/__init__.py +++ b/pythonforandroid/recipes/secp256k1/__init__.py @@ -24,7 +24,7 @@ class Secp256k1Recipe(CppCompiledComponentsPythonRecipe): "pkg-config.patch", "find_lib.patch", "no-download.patch"] def get_recipe_env(self, arch=None): - env = super(Secp256k1Recipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) libsecp256k1 = self.get_recipe('libsecp256k1', self.ctx) libsecp256k1_dir = libsecp256k1.get_build_dir(arch.arch) env['CFLAGS'] += ' -I' + os.path.join(libsecp256k1_dir, 'include') diff --git a/pythonforandroid/recipes/shapely/__init__.py b/pythonforandroid/recipes/shapely/__init__.py index f70876132e..7ecf0f078a 100644 --- a/pythonforandroid/recipes/shapely/__init__.py +++ b/pythonforandroid/recipes/shapely/__init__.py @@ -23,7 +23,7 @@ class ShapelyRecipe(CythonRecipe): # setup_extra_args = ['sdist'] def get_recipe_env(self, arch=None, with_flags_in_cc=True): - env = super(ShapelyRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) libgeos_install = join(self.get_recipe( 'libgeos', self.ctx).get_build_dir(arch.arch), 'install_target') diff --git a/pythonforandroid/recipes/sqlite3/__init__.py b/pythonforandroid/recipes/sqlite3/__init__.py index cfdcb0f6ab..e1324f3e9c 100644 --- a/pythonforandroid/recipes/sqlite3/__init__.py +++ b/pythonforandroid/recipes/sqlite3/__init__.py @@ -14,20 +14,20 @@ def should_build(self, arch): return not self.has_libs(arch, 'libsqlite3.so') def prebuild_arch(self, arch): - super(Sqlite3Recipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) # Copy the Android make file sh.mkdir('-p', join(self.get_build_dir(arch.arch), 'jni')) shutil.copyfile(join(self.get_recipe_dir(), 'Android.mk'), join(self.get_build_dir(arch.arch), 'jni/Android.mk')) def build_arch(self, arch, *extra_args): - super(Sqlite3Recipe, self).build_arch(arch) + super().build_arch(arch) # Copy the shared library shutil.copyfile(join(self.get_build_dir(arch.arch), 'libs', arch.arch, 'libsqlite3.so'), join(self.ctx.get_libs_dir(arch.arch), 'libsqlite3.so')) def get_recipe_env(self, arch): - env = super(Sqlite3Recipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) env['NDK_PROJECT_PATH'] = self.get_build_dir(arch.arch) return env diff --git a/pythonforandroid/recipes/twisted/__init__.py b/pythonforandroid/recipes/twisted/__init__.py index 11da3094d5..0350ed7949 100644 --- a/pythonforandroid/recipes/twisted/__init__.py +++ b/pythonforandroid/recipes/twisted/__init__.py @@ -12,12 +12,12 @@ class TwistedRecipe(CythonRecipe): install_in_hostpython = False def prebuild_arch(self, arch): - super(TwistedRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) # TODO Need to whitelist tty.pyo and termios.so here print('Should remove twisted tests etc. here, but skipping for now') def get_recipe_env(self, arch): - env = super(TwistedRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) # We add BUILDLIB_PATH to PYTHONPATH so twisted can find _io.so env['PYTHONPATH'] = ':'.join([ self.ctx.get_site_packages_dir(), diff --git a/pythonforandroid/recipes/vlc/__init__.py b/pythonforandroid/recipes/vlc/__init__.py index 66f51b96a1..490c4f2a18 100644 --- a/pythonforandroid/recipes/vlc/__init__.py +++ b/pythonforandroid/recipes/vlc/__init__.py @@ -18,7 +18,7 @@ class VlcRecipe(Recipe): aars = {} # for future use of multiple arch def prebuild_arch(self, arch): - super(VlcRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) build_dir = self.get_build_dir(arch.arch) port_dir = join(build_dir, 'vlc-port-android') if self.ENV_LIBVLC_AAR in environ: @@ -50,7 +50,7 @@ def prebuild_arch(self, arch): # _tail=20, _critical=True) def build_arch(self, arch): - super(VlcRecipe, self).build_arch(arch) + super().build_arch(arch) build_dir = self.get_build_dir(arch.arch) port_dir = join(build_dir, 'vlc-port-android') aar = self.aars[arch] diff --git a/pythonforandroid/recipes/zbar/__init__.py b/pythonforandroid/recipes/zbar/__init__.py index 62aa85bbe7..1656895795 100644 --- a/pythonforandroid/recipes/zbar/__init__.py +++ b/pythonforandroid/recipes/zbar/__init__.py @@ -20,7 +20,7 @@ class ZBarRecipe(PythonRecipe): patches = ["zbar-0.10-python-crash.patch"] def get_recipe_env(self, arch=None, with_flags_in_cc=True): - env = super(ZBarRecipe, self).get_recipe_env(arch, with_flags_in_cc) + env = super().get_recipe_env(arch, with_flags_in_cc) libzbar = self.get_recipe('libzbar', self.ctx) libzbar_dir = libzbar.get_build_dir(arch.arch) env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() diff --git a/pythonforandroid/recipes/zbarlight/__init__.py b/pythonforandroid/recipes/zbarlight/__init__.py index 966c7fb241..0f1d718835 100644 --- a/pythonforandroid/recipes/zbarlight/__init__.py +++ b/pythonforandroid/recipes/zbarlight/__init__.py @@ -13,7 +13,7 @@ class ZBarLightRecipe(PythonRecipe): depends = ['setuptools', 'libzbar'] def get_recipe_env(self, arch=None, with_flags_in_cc=True): - env = super(ZBarLightRecipe, self).get_recipe_env(arch, with_flags_in_cc) + env = super().get_recipe_env(arch, with_flags_in_cc) libzbar = self.get_recipe('libzbar', self.ctx) libzbar_dir = libzbar.get_build_dir(arch.arch) env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() diff --git a/pythonforandroid/recipes/zope/__init__.py b/pythonforandroid/recipes/zope/__init__.py index 579a7600c5..9d439cccde 100644 --- a/pythonforandroid/recipes/zope/__init__.py +++ b/pythonforandroid/recipes/zope/__init__.py @@ -11,7 +11,7 @@ class ZopeRecipe(PythonRecipe): depends = [] def get_recipe_env(self, arch): - env = super(ZopeRecipe, self).get_recipe_env(arch) + env = super().get_recipe_env(arch) # These are in the old zope recipe but seem like they shouldn't actually be necessary env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format( @@ -19,7 +19,7 @@ def get_recipe_env(self, arch): env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink') def postbuild_arch(self, arch): - super(ZopeRecipe, self).postbuild_arch(arch) + super().postbuild_arch(arch) # Should do some deleting here diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py index 245ebc8082..f4142a5b00 100644 --- a/pythonforandroid/recipes/zope_interface/__init__.py +++ b/pythonforandroid/recipes/zope_interface/__init__.py @@ -14,7 +14,7 @@ class ZopeInterfaceRecipe(PythonRecipe): patches = ['no_tests.patch'] def build_arch(self, arch): - super(ZopeInterfaceRecipe, self).build_arch(arch) + super().build_arch(arch) # The zope.interface module lacks of the __init__.py file in one of his # folders (once is installed), that leads into an ImportError. # Here we intentionally apply a patch to solve that, so, in case that @@ -23,7 +23,7 @@ def build_arch(self, arch): self.apply_patch('fix-init.patch', arch.arch, build_dir=zope_install) def prebuild_arch(self, arch): - super(ZopeInterfaceRecipe, self).prebuild_arch(arch) + super().prebuild_arch(arch) with current_directory(self.get_build_dir(arch.arch)): sh.rm( '-rf', diff --git a/pythonforandroid/util.py b/pythonforandroid/util.py index 839858cb1e..d4719ba160 100644 --- a/pythonforandroid/util.py +++ b/pythonforandroid/util.py @@ -102,7 +102,7 @@ def walk_valid_filens(base_dir, invalid_dir_names, invalid_file_patterns): class BuildInterruptingException(Exception): def __init__(self, message, instructions=None): - super(BuildInterruptingException, self).__init__(message, instructions) + super().__init__(message, instructions) self.message = message self.instructions = instructions diff --git a/tests/test_recipe.py b/tests/test_recipe.py index 9ff1713c95..18a1849ab6 100644 --- a/tests/test_recipe.py +++ b/tests/test_recipe.py @@ -189,7 +189,7 @@ def setUp(self): Initialize a Context with a Bootstrap and a Distribution to properly test an library recipe, to do so we reuse `BaseClassSetupBootstrap` """ - super(TestLibraryRecipe, self).setUp() + super().setUp() self.ctx.bootstrap = Bootstrap().get_bootstrap('sdl2', self.ctx) self.setUp_distribution_with_bootstrap(self.ctx.bootstrap) @@ -242,7 +242,7 @@ def setUp(self): test a recipe which depends on android's STL library, to do so we reuse `BaseClassSetupBootstrap` """ - super(TesSTLRecipe, self).setUp() + super().setUp() self.ctx.bootstrap = Bootstrap().get_bootstrap('sdl2', self.ctx) self.setUp_distribution_with_bootstrap(self.ctx.bootstrap) self.ctx.python_recipe = Recipe.get_recipe('python3', self.ctx)