Skip to content

Commit db4059d

Browse files
authored
Merge pull request #3079 from cclauss/codespell
Fix typos discovered by codespell
2 parents 9bfa3eb + e58b75e commit db4059d

File tree

23 files changed

+72
-72
lines changed

23 files changed

+72
-72
lines changed

CHANGELOG.md

Lines changed: 44 additions & 44 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ packages:
178178
of the project will be run. This happens with cross compilation set up
179179
(`CC`/`CFLAGS`/... set to use the
180180
proper toolchain) and a custom site-packages location.
181-
The actual comand is a simple `pip install .` in the project folder
181+
The actual command is a simple `pip install .` in the project folder
182182
with some extra options: e.g. all dependencies that were already
183183
installed by recipes will be pinned with a `-c` constraints file
184184
to make sure pip won't install them, and build isolation will be

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It can generate:
1212
* [Android App Bundle](https://developer.android.com/guide/app-bundle/faq)
1313
(AAB) files which can be shared on [Google Play Store](https://play.google.com/store/).
1414
* [Android Archive](https://developer.android.com/studio/projects/android-library)
15-
(AAR) files which can be used as a re-usable bundle of resources for other
15+
(AAR) files which can be used as a reusable bundle of resources for other
1616
projects.
1717

1818
It supports multiple CPU architectures.
@@ -26,7 +26,7 @@ a Python web server.
2626
It automatically supports dependencies on most pure Python packages. For other
2727
packages, including those that depend on C code, a special "recipe" must be
2828
written to support cross-compiling. python-for-android comes with recipes for
29-
many of the mosty popular libraries (e.g. numpy and sqlalchemy) built in.
29+
many of the most popular libraries (e.g. numpy and sqlalchemy) built in.
3030

3131
python-for-android works by cross-compiling the Python interpreter and its
3232
dependencies for Android devices, and bundling it with the app's python code

doc/source/buildoptions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ across all the other bootstraps, the Qt bootstrap introduces the following 3 new
250250
These build options are automatically populated by the ``pyside6-android-deploy`` tool, but can be
251251
modified by updating the ``buildozer.spec`` file. Apart from the above 3 build options, the tool
252252
also automatically identifies the values to be fed into the cli options ``--permission``, ``--add-jar``
253-
depending on the PySide6 modules used by the applicaiton.
253+
depending on the PySide6 modules used by the application.
254254

255255
Requirements blacklist (APK size optimization)
256256
----------------------------------------------

doc/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It can generate:
1313
* `Android App Bundle <https://developer.android.com/guide/app-bundle/faq>`_
1414
(AAB) files which can be shared on `Google Play Store <https://play.google.com/store/>`_.
1515
* `Android Archive <https://developer.android.com/studio/projects/android-library>`_
16-
(AAR) files which can be used as a re-usable bundle of resources for other
16+
(AAR) files which can be used as a reusable bundle of resources for other
1717
projects.
1818

1919
It supports multiple CPU architectures.
@@ -27,7 +27,7 @@ a Python web server.
2727
It automatically supports dependencies on most pure Python packages. For other
2828
packages, including those that depend on C code, a special "recipe" must be
2929
written to support cross-compiling. python-for-android comes with recipes for
30-
many of the mosty popular libraries (e.g. numpy and sqlalchemy) built in.
30+
many of the most popular libraries (e.g. numpy and sqlalchemy) built in.
3131

3232
python-for-android works by cross-compiling the Python interpreter and its
3333
dependencies for Android devices, and bundling it with the app's python code

doc/source/services.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ of your APK.
8989
If you are using buildozer, the identifier is set by the ``package.name``
9090
and ``package.domain`` values in your buildozer.spec file.
9191
The name of the service is ``ServiceMyservice``, where ``Myservice``
92-
is the name specied by one of the ``services`` values, but with the first
92+
is the name specified by one of the ``services`` values, but with the first
9393
letter upper case.
9494

9595
If you are using python-for-android directly, the identifier is set by the ``--package``

pythonforandroid/bootstraps/common/build/build.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def get_bootstrap_name():
5555
curdir = dirname(__file__)
5656

5757
BLACKLIST_PATTERNS = [
58-
# code versionning
58+
# code versioning
5959
'^*.hg/*',
6060
'^*.git/*',
6161
'^*.bzr/*',
@@ -170,7 +170,7 @@ def clean(tinfo):
170170
files.append((fn, relpath(realpath(fn), sd)))
171171
files.sort() # deterministic
172172

173-
# create tar.gz of thoses files
173+
# create tar.gz of those files
174174
gf = GzipFile(tfn, 'wb', mtime=0) # deterministic
175175
tf = tarfile.open(None, 'w', gf, format=tarfile.USTAR_FORMAT)
176176
dirs = []
@@ -339,7 +339,7 @@ def make_package(args):
339339
else:
340340
shutil.copytree(res_dir, res_dir_initial)
341341

342-
# Add user resouces
342+
# Add user resources
343343
for resource in args.resources:
344344
resource_src, resource_dest = resource.split(":")
345345
if isfile(realpath(resource_src)):

pythonforandroid/bootstraps/common/build/jni/application/src/start.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ void Java_org_kivy_android_PythonActivity_nativeInit(JNIEnv* env, jclass cls, jo
417417
{
418418
/* This nativeInit follows SDL2 */
419419

420-
/* This interface could expand with ABI negotiation, calbacks, etc. */
420+
/* This interface could expand with ABI negotiation, callbacks, etc. */
421421
/* SDL_Android_Init(env, cls); */
422422

423423
/* SDL_SetMainReady(); */

pythonforandroid/bootstraps/common/build/src/main/java/org/kamranzafar/jtar/TarHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* '4' Block special
4949
* '5' Directory
5050
* '6' FIFO
51-
* '7' Contigous
51+
* '7' Contiguous
5252
* </pre>
5353
*
5454
*

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public void onDestroy() {
180180
@Override
181181
public void onTaskRemoved(Intent rootIntent) {
182182
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
184184
if (startType() != START_STICKY) {
185185
stopSelf();
186186
}

pythonforandroid/bootstraps/common/build/src/main/java/org/renpy/android/Hardware.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public static boolean checkNetwork()
260260
}
261261

262262
/**
263-
* To recieve network state changes
263+
* To receive network state changes
264264
*/
265265
public static void registerNetworkCheck()
266266
{

pythonforandroid/bootstraps/service_only/build/blacklist.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ lib-dynload/_testcapi.so
8484
plat-linux3/regen
8585

8686
#>sqlite3
87-
# conditionnal include depending if some recipes are included or not.
87+
# conditional include depending if some recipes are included or not.
8888
sqlite3/*
8989
lib-dynload/_sqlite3.so
9090
#<sqlite3

pythonforandroid/bootstraps/webview/build/blacklist.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ lib-dynload/_testcapi.so
8484
plat-linux3/regen
8585

8686
#>sqlite3
87-
# conditionnal include depending if some recipes are included or not.
87+
# conditional include depending if some recipes are included or not.
8888
sqlite3/*
8989
lib-dynload/_sqlite3.so
9090
#<sqlite3

pythonforandroid/graph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def get_recipe_order_and_bootstrap(ctx, names, bs=None, blacklist=None):
264264
names.append(cleaned_up_tuple)
265265

266266
# Do check for obvious conflicts (that would trigger in any order, and
267-
# without comitting to any specific choice in a multi-choice tuple of
267+
# without committing to any specific choice in a multi-choice tuple of
268268
# dependencies):
269269
obvious_conflict_checker(ctx, names, blacklist=blacklist)
270270
# If we get here, no obvious conflicts!

pythonforandroid/pythonpackage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def extract_metainfo_files_from_package(
7979
output_folder,
8080
debug=False
8181
):
82-
""" Extracts metdata files from the given package to the given folder,
82+
""" Extracts metadata files from the given package to the given folder,
8383
which may be referenced in any way that is permitted in
8484
a requirements.txt file or install_requires=[] listing.
8585

pythonforandroid/recipe.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def report_hook(index, blksize, size):
203203
while True:
204204
try:
205205
# jqueryui.com returns a 403 w/ the default user agent
206-
# Mozilla/5.0 doesnt handle redirection for liblzma
206+
# Mozilla/5.0 does not handle redirection for liblzma
207207
url_opener.addheaders = [('User-agent', 'Wget/1.0')]
208208
urlretrieve(url, target, report_hook)
209209
except OSError as e:
@@ -729,7 +729,7 @@ def prepare_build_dir(self, arch):
729729

730730
class BootstrapNDKRecipe(Recipe):
731731
'''A recipe class for recipes built in an Android project jni dir with
732-
an Android.mk. These are not cached separatly, but built in the
732+
an Android.mk. These are not cached separately, but built in the
733733
bootstrap's own building directory.
734734
735735
To build an NDK project which is not part of the bootstrap, see
@@ -1233,7 +1233,7 @@ def build_arch(self, arch):
12331233
)
12341234
build_dir = self.get_build_dir(arch.arch)
12351235
env = self.get_recipe_env(arch, with_flags_in_cc=True)
1236-
# make build dir separatly
1236+
# make build dir separately
12371237
sub_build_dir = join(build_dir, "p4a_android_build")
12381238
ensure_dir(sub_build_dir)
12391239
# copy hostpython to built python to ensure correct selection of libs and includes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def _expand_partial_name(partial_name):
3232
else:
3333
name = 'ACTION_{}'.format(partial_name.upper())
3434
if not hasattr(Intent, name):
35-
raise Exception('The intent {} doesnt exist'.format(name))
35+
raise Exception('The intent {} does not exist'.format(name))
3636
return getattr(Intent, name)
3737

3838
# resolve actions/categories first

pythonforandroid/recipes/android/src/android/permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ def request_permissions(permissions, callback=None):
590590
See Android documentation for onPermissionsCallbackResult for
591591
further information.
592592
593-
Note that if the request is interupted the callback may contain an empty
593+
Note that if the request is interrupted the callback may contain an empty
594594
list of permissions, without permissions being granted; the App should
595595
check that each permission requested has been granted.
596596

pythonforandroid/recipes/ffpyplayer/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
3232
env['LIBLINK'] = 'NOTNONE'
3333

3434
# ffmpeg recipe enables GPL components only if ffpyplayer_codecs recipe used.
35-
# Therefor we need to disable libpostproc if skipped.
35+
# Therefore we need to disable libpostproc if skipped.
3636
if 'ffpyplayer_codecs' not in self.ctx.recipe_build_order:
3737
env["CONFIG_POSTPROC"] = '0'
3838

pythonforandroid/recipes/libxml2/glob.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
683683

684684

685685
/*
686-
* Extend the gl_pathv member of a glob_t structure to accomodate a new item,
686+
* Extend the gl_pathv member of a glob_t structure to accommodate a new item,
687687
* add the new item, and update gl_pathc.
688688
*
689689
* This assumes the BSD realloc, which only copies the block when its size

pythonforandroid/recipes/libxml2/glob.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ typedef struct {
8080
#define GLOB_NOSPACE (-1) /* Malloc call failed. */
8181
#define GLOB_ABORTED (-2) /* Unignored error. */
8282
#define GLOB_NOMATCH (-3) /* No match and GLOB_NOCHECK was not set. */
83-
#define GLOB_NOSYS (-4) /* Obsolete: source comptability only. */
83+
#define GLOB_NOSYS (-4) /* Obsolete: source compatibility only. */
8484
#endif /* __POSIX_VISIBLE >= 199209 */
8585

8686
#if __BSD_VISIBLE

pythonforandroid/recipes/opencv/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def build_arch(self, arch):
9090
version=python_link_version),
9191

9292
'-DBUILD_WITH_STANDALONE_TOOLCHAIN=ON',
93-
# Force to build as shared libraries the cv2's dependant
93+
# Force to build as shared libraries the cv2's dependent
9494
# libs or we will not be able to link with our python
9595
'-DBUILD_SHARED_LIBS=ON',
9696
'-DBUILD_STATIC_LIBS=OFF',

tests/test_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_strip_if_with_debug_symbols(self):
5151
assert m_CythonRecipe().strip_object_files.called is False
5252

5353
# Make sure strip object files IS called when
54-
# `with_debug_symbols` is fasle:
54+
# `with_debug_symbols` is false:
5555
ctx.with_debug_symbols = False
5656
assert run_pymodules_install(ctx, ctx.archs[0], modules, project_dir) is None
5757
assert m_CythonRecipe().strip_object_files.called is True

0 commit comments

Comments
 (0)