From 174d8a6a4a76d54e2fab3b2b7d533ca1d70e1a20 Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:09:01 +0530 Subject: [PATCH 1/8] Update mixer.py --- p4a/pythonforandroid/recipes/android/src/android/mixer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/p4a/pythonforandroid/recipes/android/src/android/mixer.py b/p4a/pythonforandroid/recipes/android/src/android/mixer.py index 303a9530..afafa57c 100644 --- a/p4a/pythonforandroid/recipes/android/src/android/mixer.py +++ b/p4a/pythonforandroid/recipes/android/src/android/mixer.py @@ -93,9 +93,7 @@ def find_channel(force=False): if not force: return None - busy.sort(key=lambda x: x.play_time) - - return busy[0] + min(busy, key=lambda x: x.play_time) class ChannelImpl(object): -- 2.45.3 From 3ea89915405961aa6e674420da16a8a852a4db6a Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:11:20 +0530 Subject: [PATCH 2/8] Update graph.py --- p4a/pythonforandroid/graph.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/p4a/pythonforandroid/graph.py b/p4a/pythonforandroid/graph.py index 2e98e8cc..646a66e1 100644 --- a/p4a/pythonforandroid/graph.py +++ b/p4a/pythonforandroid/graph.py @@ -293,8 +293,7 @@ def get_recipe_order_and_bootstrap(ctx, names, bs=None, blacklist=None): orders.append(list(order)) # prefer python3 and SDL2 if available - orders = sorted(orders, - key=lambda order: -('python3' in order) - ('sdl2' in order)) + orders.sort(key=lambda order: -('python3' in order) - ('sdl2' in order)) if not orders: raise BuildInterruptingException( -- 2.45.3 From dec5af480aabf3c1e7db94884fa751daa2adbb60 Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:13:21 +0530 Subject: [PATCH 3/8] Update mixer.py --- recipes/android/src/android/mixer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/android/src/android/mixer.py b/recipes/android/src/android/mixer.py index 4ac224a7..65e106de 100644 --- a/recipes/android/src/android/mixer.py +++ b/recipes/android/src/android/mixer.py @@ -79,9 +79,7 @@ def find_channel(force=False): if not force: return None - busy.sort(key=lambda x : x.play_time) - - return busy[0] + return min(busy, key=lambda x : x.play_time) class ChannelImpl(object): -- 2.45.3 From 00f31d5067804cd9ea8ace96102ad60656ea6622 Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:14:34 +0530 Subject: [PATCH 4/8] Update mixer.py --- p4a/pythonforandroid/recipes/android/src/android/mixer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p4a/pythonforandroid/recipes/android/src/android/mixer.py b/p4a/pythonforandroid/recipes/android/src/android/mixer.py index afafa57c..334f696e 100644 --- a/p4a/pythonforandroid/recipes/android/src/android/mixer.py +++ b/p4a/pythonforandroid/recipes/android/src/android/mixer.py @@ -93,7 +93,7 @@ def find_channel(force=False): if not force: return None - min(busy, key=lambda x: x.play_time) + return min(busy, key=lambda x: x.play_time) class ChannelImpl(object): -- 2.45.3 From 631ca5e847adbcc0343d69122af72b317f4fa04f Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:17:54 +0530 Subject: [PATCH 5/8] Update bdistapk.py --- p4a/pythonforandroid/bdistapk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p4a/pythonforandroid/bdistapk.py b/p4a/pythonforandroid/bdistapk.py index 5bdd1c68..a27f4d1b 100644 --- a/p4a/pythonforandroid/bdistapk.py +++ b/p4a/pythonforandroid/bdistapk.py @@ -123,7 +123,7 @@ class BdistAPK(Command): exit(1) if len(main_py_dirs) > 1: print('WARNING: Multiple main.py dirs found, using the shortest path') - main_py_dirs = sorted(main_py_dirs, key=lambda j: len(split(j))) + main_py_dirs.sort(key=lambda j: len(split(j))) if not argv_contains('--launcher'): sys.argv.append('--private={}'.format( @@ -145,4 +145,4 @@ def _set_user_options(): BdistAPK.user_options = user_options -_set_user_options() \ No newline at end of file +_set_user_options() -- 2.45.3 From ac3618eb6151925cccc5962909e2a0b09ffbf81c Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:27:01 +0530 Subject: [PATCH 6/8] Update toolchain.py --- p4a/pythonforandroid/toolchain.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/p4a/pythonforandroid/toolchain.py b/p4a/pythonforandroid/toolchain.py index f4ab7f45..6796f94c 100644 --- a/p4a/pythonforandroid/toolchain.py +++ b/p4a/pythonforandroid/toolchain.py @@ -822,8 +822,7 @@ class ToolchainCL(object): build_tools_versions = os.listdir(join(ctx.sdk_dir, 'build-tools')) - build_tools_versions = sorted(build_tools_versions, - key=LooseVersion) + build_tools_versions.sort(key=LooseVersion) build_tools_version = build_tools_versions[-1] info(('Detected highest available build tools ' 'version to be {}').format(build_tools_version)) -- 2.45.3 From fb806cfecd1bb784e4e72d9c0694b3c46a2deddb Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:30:42 +0530 Subject: [PATCH 7/8] Update build.py --- p4a/pythonforandroid/bootstraps/lbry/build/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/build.py b/p4a/pythonforandroid/bootstraps/lbry/build/build.py index 71e5e7c9..584e6ed1 100755 --- a/p4a/pythonforandroid/bootstraps/lbry/build/build.py +++ b/p4a/pythonforandroid/bootstraps/lbry/build/build.py @@ -344,8 +344,7 @@ main.py that loads it.''') # Try to build with the newest available build tools build_tools_versions = listdir(join(sdk_dir, 'build-tools')) - build_tools_versions = sorted(build_tools_versions, - key=LooseVersion) + build_tools_versions.sort(key=LooseVersion) build_tools_version = build_tools_versions[-1] -- 2.45.3 From 6a0878f9cbea3cf516f18bd60afedeecc1e0d7be Mon Sep 17 00:00:00 2001 From: g1tman Date: Thu, 31 Oct 2019 16:32:39 +0530 Subject: [PATCH 8/8] Update build.py --- p4a/pythonforandroid/bootstraps/common/build/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/p4a/pythonforandroid/bootstraps/common/build/build.py b/p4a/pythonforandroid/bootstraps/common/build/build.py index 38fe2b77..342115e0 100644 --- a/p4a/pythonforandroid/bootstraps/common/build/build.py +++ b/p4a/pythonforandroid/bootstraps/common/build/build.py @@ -447,8 +447,7 @@ main.py that loads it.''') # Try to build with the newest available build tools ignored = {".DS_Store", ".ds_store"} build_tools_versions = [x for x in listdir(join(sdk_dir, 'build-tools')) if x not in ignored] - build_tools_versions = sorted(build_tools_versions, - key=LooseVersion) + build_tools_versions.sort(key=LooseVersion) build_tools_version = build_tools_versions[-1] # Folder name for launcher (used by SDL2 bootstrap) -- 2.45.3