Merge pull request #3079 from cclauss/codespell

AndreMiras · web-flow · commit db4059d5346e · 2024-10-21T08:17:42.000+02:00
Fix typos discovered by codespell
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -178,7 +178,7 @@ packages:
    of the project will be run. This happens with cross compilation set up
    (`CC`/`CFLAGS`/... set to use the
    proper toolchain) and a custom site-packages location.
-   The actual comand is a simple `pip install .` in the project folder
+   The actual command is a simple `pip install .` in the project folder
    with some extra options: e.g. all dependencies that were already
    installed by recipes will be pinned with a `-c` constraints file
    to make sure pip won't install them, and build isolation will be
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ It can generate:
 * [Android App Bundle](https://developer.android.com/guide/app-bundle/faq) 
   (AAB) files which can be shared on [Google Play Store](https://play.google.com/store/).
 * [Android Archive](https://developer.android.com/studio/projects/android-library)
-  (AAR) files which can be used as a re-usable bundle of resources for other 
+  (AAR) files which can be used as a reusable bundle of resources for other 
   projects.
  
 It supports multiple CPU architectures.
@@ -26,7 +26,7 @@ a Python web server.
 It automatically supports dependencies on most pure Python packages. For other
 packages, including those that depend on C code, a special "recipe" must be 
 written to support cross-compiling. python-for-android comes with recipes for
-many of the mosty popular libraries (e.g. numpy and sqlalchemy) built in.
+many of the most popular libraries (e.g. numpy and sqlalchemy) built in.
 
 python-for-android works by cross-compiling the Python interpreter and its
 dependencies for Android devices, and bundling it with the app's python code
diff --git a/doc/source/buildoptions.rst b/doc/source/buildoptions.rst
@@ -250,7 +250,7 @@ across all the other bootstraps, the Qt bootstrap introduces the following 3 new
 These build options are automatically populated by the ``pyside6-android-deploy`` tool, but can be
 modified by updating the ``buildozer.spec`` file. Apart from the above 3 build options, the tool
 also automatically identifies the values to be fed into the cli options ``--permission``, ``--add-jar``
-depending on the PySide6 modules used by the applicaiton.
+depending on the PySide6 modules used by the application.
 
 Requirements blacklist (APK size optimization)
 ----------------------------------------------
diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -13,7 +13,7 @@ It can generate:
 * `Android App Bundle <https://developer.android.com/guide/app-bundle/faq>`_
   (AAB) files which can be shared on `Google Play Store <https://play.google.com/store/>`_.
 * `Android Archive <https://developer.android.com/studio/projects/android-library>`_
-  (AAR) files which can be used as a re-usable bundle of resources for other
+  (AAR) files which can be used as a reusable bundle of resources for other
   projects.
 
 It supports multiple CPU architectures.
@@ -27,7 +27,7 @@ a Python web server.
 It automatically supports dependencies on most pure Python packages. For other
 packages, including those that depend on C code, a special "recipe" must be
 written to support cross-compiling. python-for-android comes with recipes for
-many of the mosty popular libraries (e.g. numpy and sqlalchemy) built in.
+many of the most popular libraries (e.g. numpy and sqlalchemy) built in.
 
 python-for-android works by cross-compiling the Python interpreter and its
 dependencies for Android devices, and bundling it with the app's python code
diff --git a/doc/source/services.rst b/doc/source/services.rst
@@ -89,7 +89,7 @@ of your APK.
 If you are using buildozer, the identifier is set by the ``package.name``
 and ``package.domain`` values in your buildozer.spec file.
 The name of the service is ``ServiceMyservice``, where ``Myservice``
-is the name specied by one of the ``services`` values, but with the first
+is the name specified by one of the ``services`` values, but with the first
 letter upper case. 
 
 If you are using python-for-android directly, the identifier is set by the ``--package``
diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py
@@ -55,7 +55,7 @@ def get_bootstrap_name():
 curdir = dirname(__file__)
 
 BLACKLIST_PATTERNS = [
-    # code versionning
+    # code versioning
     '^*.hg/*',
     '^*.git/*',
     '^*.bzr/*',
@@ -170,7 +170,7 @@ def clean(tinfo):
             files.append((fn, relpath(realpath(fn), sd)))
     files.sort()  # deterministic
 
-    # create tar.gz of thoses files
+    # create tar.gz of those files
     gf = GzipFile(tfn, 'wb', mtime=0)  # deterministic
     tf = tarfile.open(None, 'w', gf, format=tarfile.USTAR_FORMAT)
     dirs = []
@@ -339,7 +339,7 @@ def make_package(args):
     else:
         shutil.copytree(res_dir, res_dir_initial)
 
-    # Add user resouces
+    # Add user resources
     for resource in args.resources:
         resource_src, resource_dest = resource.split(":")
         if isfile(realpath(resource_src)):
diff --git a/pythonforandroid/bootstraps/common/build/jni/application/src/start.c b/pythonforandroid/bootstraps/common/build/jni/application/src/start.c
@@ -417,7 +417,7 @@ void Java_org_kivy_android_PythonActivity_nativeInit(JNIEnv* env, jclass cls, jo
 {
   /* This nativeInit follows SDL2 */
 
-  /* This interface could expand with ABI negotiation, calbacks, etc. */
+  /* This interface could expand with ABI negotiation, callbacks, etc. */
   /* SDL_Android_Init(env, cls); */
 
   /* SDL_SetMainReady(); */
diff --git a/pythonforandroid/bootstraps/common/build/src/main/java/org/kamranzafar/jtar/TarHeader.java b/pythonforandroid/bootstraps/common/build/src/main/java/org/kamranzafar/jtar/TarHeader.java
@@ -48,7 +48,7 @@
  * '4'          Block special
  * '5'          Directory
  * '6'          FIFO
- * '7'          Contigous
+ * '7'          Contiguous
  * </pre>
  * 
  * 
diff --git a/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java b/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java
@@ -180,7 +180,7 @@ public void onDestroy() {
     @Override
     public void onTaskRemoved(Intent rootIntent) {
         super.onTaskRemoved(rootIntent);
-        //sticky servcie runtime/restart is managed by the OS. leave it running when app is closed
+        //sticky service runtime/restart is managed by the OS. leave it running when app is closed
         if (startType() != START_STICKY) {
             stopSelf();
         }
diff --git a/pythonforandroid/bootstraps/common/build/src/main/java/org/renpy/android/Hardware.java b/pythonforandroid/bootstraps/common/build/src/main/java/org/renpy/android/Hardware.java
@@ -260,7 +260,7 @@ public static boolean checkNetwork()
     }
 
     /**
-     * To recieve network state changes
+     * To receive network state changes
      */
     public static void registerNetworkCheck()
     {
diff --git a/pythonforandroid/bootstraps/service_only/build/blacklist.txt b/pythonforandroid/bootstraps/service_only/build/blacklist.txt
@@ -84,7 +84,7 @@ lib-dynload/_testcapi.so
 plat-linux3/regen
 
 #>sqlite3
-# conditionnal include depending if some recipes are included or not.
+# conditional include depending if some recipes are included or not.
 sqlite3/*
 lib-dynload/_sqlite3.so
 #<sqlite3
diff --git a/pythonforandroid/bootstraps/webview/build/blacklist.txt b/pythonforandroid/bootstraps/webview/build/blacklist.txt
@@ -84,7 +84,7 @@ lib-dynload/_testcapi.so
 plat-linux3/regen
 
 #>sqlite3
-# conditionnal include depending if some recipes are included or not.
+# conditional include depending if some recipes are included or not.
 sqlite3/*
 lib-dynload/_sqlite3.so
 #<sqlite3
diff --git a/pythonforandroid/graph.py b/pythonforandroid/graph.py
@@ -264,7 +264,7 @@ def get_recipe_order_and_bootstrap(ctx, names, bs=None, blacklist=None):
             names.append(cleaned_up_tuple)
 
     # Do check for obvious conflicts (that would trigger in any order, and
-    # without comitting to any specific choice in a multi-choice tuple of
+    # without committing to any specific choice in a multi-choice tuple of
     # dependencies):
     obvious_conflict_checker(ctx, names, blacklist=blacklist)
     # If we get here, no obvious conflicts!
diff --git a/pythonforandroid/pythonpackage.py b/pythonforandroid/pythonpackage.py
@@ -79,7 +79,7 @@ def extract_metainfo_files_from_package(
         output_folder,
         debug=False
         ):
-    """ Extracts metdata files from the given package to the given folder,
+    """ Extracts metadata files from the given package to the given folder,
         which may be referenced in any way that is permitted in
         a requirements.txt file or install_requires=[] listing.
 
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -203,7 +203,7 @@ def report_hook(index, blksize, size):
             while True:
                 try:
                     # jqueryui.com returns a 403 w/ the default user agent
-                    # Mozilla/5.0 doesnt handle redirection for liblzma
+                    # Mozilla/5.0 does not handle redirection for liblzma
                     url_opener.addheaders = [('User-agent', 'Wget/1.0')]
                     urlretrieve(url, target, report_hook)
                 except OSError as e:
@@ -729,7 +729,7 @@ def prepare_build_dir(self, arch):
 
 class BootstrapNDKRecipe(Recipe):
     '''A recipe class for recipes built in an Android project jni dir with
-    an Android.mk. These are not cached separatly, but built in the
+    an Android.mk. These are not cached separately, but built in the
     bootstrap's own building directory.
 
     To build an NDK project which is not part of the bootstrap, see
@@ -1233,7 +1233,7 @@ def build_arch(self, arch):
         )
         build_dir = self.get_build_dir(arch.arch)
         env = self.get_recipe_env(arch, with_flags_in_cc=True)
-        # make build dir separatly
+        # make build dir separately
         sub_build_dir = join(build_dir, "p4a_android_build")
         ensure_dir(sub_build_dir)
         # copy hostpython to built python to ensure correct selection of libs and includes
diff --git a/pythonforandroid/recipes/android/src/android/broadcast.py b/pythonforandroid/recipes/android/src/android/broadcast.py
@@ -32,7 +32,7 @@ def _expand_partial_name(partial_name):
             else:
                 name = 'ACTION_{}'.format(partial_name.upper())
                 if not hasattr(Intent, name):
-                    raise Exception('The intent {} doesnt exist'.format(name))
+                    raise Exception('The intent {} does not exist'.format(name))
                 return getattr(Intent, name)
 
         # resolve actions/categories first
diff --git a/pythonforandroid/recipes/android/src/android/permissions.py b/pythonforandroid/recipes/android/src/android/permissions.py
@@ -590,7 +590,7 @@ def request_permissions(permissions, callback=None):
     See Android documentation for onPermissionsCallbackResult for
     further information.
 
-    Note that if the request is interupted the callback may contain an empty
+    Note that if the request is interrupted the callback may contain an empty
     list of permissions, without permissions being granted; the App should
     check that each permission requested has been granted.
 
diff --git a/pythonforandroid/recipes/ffpyplayer/__init__.py b/pythonforandroid/recipes/ffpyplayer/__init__.py
@@ -32,7 +32,7 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
         env['LIBLINK'] = 'NOTNONE'
 
         # ffmpeg recipe enables GPL components only if ffpyplayer_codecs recipe used.
-        # Therefor we need to disable libpostproc if skipped.
+        # Therefore we need to disable libpostproc if skipped.
         if 'ffpyplayer_codecs' not in self.ctx.recipe_build_order:
             env["CONFIG_POSTPROC"] = '0'
 
diff --git a/pythonforandroid/recipes/libxml2/glob.c b/pythonforandroid/recipes/libxml2/glob.c
@@ -683,7 +683,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
 
 
 /*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
+ * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
  * add the new item, and update gl_pathc.
  *
  * This assumes the BSD realloc, which only copies the block when its size
diff --git a/pythonforandroid/recipes/libxml2/glob.h b/pythonforandroid/recipes/libxml2/glob.h
@@ -80,7 +80,7 @@ typedef struct {
 #define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
 #define	GLOB_ABORTED	(-2)	/* Unignored error. */
 #define	GLOB_NOMATCH	(-3)	/* No match and GLOB_NOCHECK was not set. */
-#define	GLOB_NOSYS	(-4)	/* Obsolete: source comptability only. */
+#define	GLOB_NOSYS	(-4)	/* Obsolete: source compatibility only. */
 #endif /* __POSIX_VISIBLE >= 199209 */
 
 #if __BSD_VISIBLE
diff --git a/pythonforandroid/recipes/opencv/__init__.py b/pythonforandroid/recipes/opencv/__init__.py
@@ -90,7 +90,7 @@ def build_arch(self, arch):
                         version=python_link_version),
 
                     '-DBUILD_WITH_STANDALONE_TOOLCHAIN=ON',
-                    # Force to build as shared libraries the cv2's dependant
+                    # Force to build as shared libraries the cv2's dependent
                     # libs or we will not be able to link with our python
                     '-DBUILD_SHARED_LIBS=ON',
                     '-DBUILD_STATIC_LIBS=OFF',
diff --git a/tests/test_build.py b/tests/test_build.py
@@ -51,7 +51,7 @@ def test_strip_if_with_debug_symbols(self):
             assert m_CythonRecipe().strip_object_files.called is False
 
             # Make sure strip object files IS called when
-            # `with_debug_symbols` is fasle:
+            # `with_debug_symbols` is false:
             ctx.with_debug_symbols = False
             assert run_pymodules_install(ctx, ctx.archs[0], modules, project_dir) is None
             assert m_CythonRecipe().strip_object_files.called is True

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ void Java_org_kivy_android_PythonActivity_nativeInit(JNIEnv* env, jclass cls, jo`
`417`	`417`	`{`
`418`	`418`	`/* This nativeInit follows SDL2 */`
`419`	`419`
`420`		`- /* This interface could expand with ABI negotiation, calbacks, etc. */`
	`420`	`+ /* This interface could expand with ABI negotiation, callbacks, etc. */`
`421`	`421`	`/* SDL_Android_Init(env, cls); */`
`422`	`422`
`423`	`423`	`/* SDL_SetMainReady(); */`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`* '4' Block special`
`49`	`49`	`* '5' Directory`
`50`	`50`	`* '6' FIFO`
`51`		`- * '7' Contigous`
	`51`	`+ * '7' Contiguous`
`52`	`52`	`* </pre>`
`53`	`53`	`*`
`54`	`54`	`*`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public void onDestroy() {`
`180`	`180`	`@Override`
`181`	`181`	`public void onTaskRemoved(Intent rootIntent) {`
`182`	`182`	`super.onTaskRemoved(rootIntent);`
`183`		`- //sticky servcie runtime/restart is managed by the OS. leave it running when app is closed`
	`183`	`+ //sticky service runtime/restart is managed by the OS. leave it running when app is closed`
`184`	`184`	`if (startType() != START_STICKY) {`
`185`	`185`	`stopSelf();`
`186`	`186`	`}`