Skip to content

Commit 8e39bc9

Browse files
authored
Fix typos and normalize ortography (#4849)
Fix typos
2 parents bec6e09 + 9b0d98c commit 8e39bc9

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

NEWS.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ Bugfixes
642642
--------
643643

644644
- In tests, rely on pytest-home for reusable fixture. (#4072)
645-
- Explicitely marked as ``Protocol`` and fixed missing ``self`` argument in interfaces ``pkg_resources.IMetadataProvider`` and ``pkg_resources.IResourceProvider`` -- by :user:`Avasam` (#4144)
645+
- Explicitly marked as ``Protocol`` and fixed missing ``self`` argument in interfaces ``pkg_resources.IMetadataProvider`` and ``pkg_resources.IResourceProvider`` -- by :user:`Avasam` (#4144)
646646
- Restored expectation that egg-link files would be named with dash separators for compatibility with pip prior to version 24. (#4167)
647647

648648

@@ -7173,7 +7173,7 @@ setuptools
71737173

71747174
* Fixed invalid URL error catching. Old Setuptools #20.
71757175

7176-
* Fixed invalid bootstraping with easy_install installation (Distribute #40).
7176+
* Fixed invalid bootstrapping with easy_install installation (Distribute #40).
71777177
Thanks to Florian Schulze for the help.
71787178

71797179
* Removed buildout/bootstrap.py. A new repository will create a specific

setuptools/_static.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Static:
2727
def _prevent_modification(target: type, method: str, copying: str) -> None:
2828
"""
2929
Because setuptools is very flexible we cannot fully prevent
30-
plugins and user customisations from modifying static values that were
30+
plugins and user customizations from modifying static values that were
3131
parsed from config files.
3232
But we can attempt to block "in-place" mutations and identify when they
3333
were done.

setuptools/command/editable_wheel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def _run_build_subcommands(self) -> None:
278278
This method implements a temporary workaround to support the ecosystem
279279
while the implementations catch up.
280280
"""
281-
# TODO: Once plugins/customisations had the chance to catch up, replace
281+
# TODO: Once plugins/customizations had the chance to catch up, replace
282282
# `self._run_build_subcommands()` with `self.run_command("build")`.
283283
# Also remove _safely_run, TestCustomBuildPy. Suggested date: Aug/2023.
284284
build = self.get_finalized_command("build")
@@ -309,7 +309,7 @@ def _safely_run(self, cmd_name: str):
309309
https://setuptools.pypa.io/en/latest/userguide/extension.html.
310310
311311
For the time being `setuptools` will silence this error and ignore
312-
the faulty command, but this behaviour will change in future versions.
312+
the faulty command, but this behavior will change in future versions.
313313
""",
314314
# TODO: define due_date
315315
# There is a series of shortcomings with the available editable install
@@ -564,7 +564,7 @@ def _encode_pth(content: str) -> bytes:
564564
.pth files are always read with 'locale' encoding, the recommendation
565565
from the cpython core developers is to write them as ``open(path, "w")``
566566
and ignore warnings (see python/cpython#77102, pypa/setuptools#3937).
567-
This function tries to simulate this behaviour without having to create an
567+
This function tries to simulate this behavior without having to create an
568568
actual file, in a way that supports a range of active Python versions.
569569
(There seems to be some variety in the way different version of Python handle
570570
``encoding=None``, not all of them use ``locale.getpreferredencoding(False)``

setuptools/command/install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def initialize_options(self):
6868
""",
6969
see_url="https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html",
7070
# TODO: Document how to bootstrap setuptools without install
71-
# (e.g. by unziping the wheel file)
71+
# (e.g. by unzipping the wheel file)
7272
# and then add a due_date to this warning.
7373
)
7474

setuptools/tests/test_build_py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def test_excluded_subpackages(tmpdir_cwd):
168168
with pytest.warns(SetuptoolsDeprecationWarning, match=msg):
169169
# TODO: To fix #3260 we need some transition period to deprecate the
170170
# existing behavior of `include_package_data`. After the transition, we
171-
# should remove the warning and fix the behaviour.
171+
# should remove the warning and fix the behavior.
172172

173173
if os.getenv("SETUPTOOLS_USE_DISTUTILS") == "stdlib":
174174
# pytest.warns reset the warning filter temporarily

setuptools/unicode_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class _Utf8EncodingNeeded(SetuptoolsDeprecationWarning):
8686
"""
8787

8888
_DETAILS = """
89-
Fallback behaviour for UTF-8 is considered **deprecated** and future versions of
89+
Fallback behavior for UTF-8 is considered **deprecated** and future versions of
9090
`setuptools` may not implement it.
9191
9292
Please encode {file!r} with "utf-8" to ensure future builds will succeed.

0 commit comments

Comments
 (0)