Use shutil.which instead of sh.which

manuq · manuq · commit 211fe887e77c · 2022-08-01T18:12:20.000-03:00
Handcrafted version of this patch upstream: kivy#2637 https://phabricator.endlessm.com/T33736
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -102,7 +102,7 @@ def select_and_check_toolchain_version(sdk_dir, ndk_dir, arch, ndk_sysroot_exist
         "gcc",
         "g++",
     ):
-        if not sh.which(executable):
+        if not shutil.which(executable):
             warning(f"Missing executable: {executable} is not installed")
 
     if not ok:
@@ -424,7 +424,7 @@ def prepare_build_environment(self,
         check_ndk_api(ndk_api, self.android_api)
 
         # path to some tools
-        self.ccache = sh.which("ccache")
+        self.ccache = shutil.which("ccache")
         if not self.ccache:
             info('ccache is missing, the build will not be optimized in the '
                  'future.')
@@ -1000,7 +1000,7 @@ def copylibs_function(soname, objs_paths, extra_link_dirs=None, env=None):
     elif 'READELF' in os.environ:
         readelf = os.environ['READELF']
     else:
-        readelf = sh.which('readelf').strip()
+        readelf = shutil.which('readelf').strip()
     readelf = sh.Command(readelf).bake('-d')
 
     dest = dirname(soname)
diff --git a/pythonforandroid/recipes/lapack/__init__.py b/pythonforandroid/recipes/lapack/__init__.py
@@ -9,6 +9,7 @@
 from multiprocessing import cpu_count
 from os.path import join
 import sh
+import shutil
 
 
 class LapackRecipe(Recipe):
@@ -25,7 +26,7 @@ def get_recipe_env(self, arch):
         sysroot = f"{self.ctx.ndk_dir}/platforms/{env['NDK_API']}/{arch.platform_dir}"
         FC = f"{env['TOOLCHAIN_PREFIX']}-gfortran"
         env['FC'] = f'{FC} --sysroot={sysroot}'
-        if sh.which(FC) is None:
+        if shutil.which(FC) is None:
             raise BuildInterruptingException(f"{FC} not found. See https://github.com/mzakharo/android-gfortran")
         return env
 
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -1,5 +1,6 @@
 import glob
 import sh
+import shutil
 import subprocess
 
 from multiprocessing import cpu_count
@@ -73,7 +74,7 @@ class Python3Recipe(TargetPythonRecipe):
         ('patches/py3.8.1.patch', version_starts_with("3.9"))
     ]
 
-    if sh.which('lld') is not None:
+    if shutil.which('lld') is not None:
         patches = patches + [
             ("patches/py3.7.1_fix_cortex_a8.patch", version_starts_with("3.7")),
             ("patches/py3.8.1_fix_cortex_a8.patch", version_starts_with("3.8")),
@@ -209,7 +210,7 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         )
 
         env['LDFLAGS'] = env.get('LDFLAGS', '')
-        if sh.which('lld') is not None:
+        if shutil.which('lld') is not None:
             # Note: The -L. is to fix a bug in python 3.7.
             # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234409
             env['LDFLAGS'] += ' -L. -fuse-ld=lld'
