Skip to content

Commit 6c95cb6

Browse files
[7.3.x] Spelling and grammar fixes (#11015)
Co-authored-by: Ville Skyttä <ville.skytta@iki.fi>
1 parent efcb81c commit 6c95cb6

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

doc/en/changelog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ Breaking Changes
567567
- `#7259 <https://github.com/pytest-dev/pytest/issues/7259>`_: The :ref:`Node.reportinfo() <non-python tests>` function first return value type has been expanded from `py.path.local | str` to `os.PathLike[str] | str`.
568568

569569
Most plugins which refer to `reportinfo()` only define it as part of a custom :class:`pytest.Item` implementation.
570-
Since `py.path.local` is a `os.PathLike[str]`, these plugins are unaffacted.
570+
Since `py.path.local` is an `os.PathLike[str]`, these plugins are unaffacted.
571571

572572
Plugins and users which call `reportinfo()`, use the first return value and interact with it as a `py.path.local`, would need to adjust by calling `py.path.local(fspath)`.
573573
Although preferably, avoid the legacy `py.path.local` and use `pathlib.Path`, or use `item.location` or `item.path`, instead.
@@ -4067,7 +4067,7 @@ Removals
40674067
See our :ref:`docs <calling fixtures directly deprecated>` on information on how to update your code.
40684068

40694069

4070-
- :issue:`4546`: Remove ``Node.get_marker(name)`` the return value was not usable for more than a existence check.
4070+
- :issue:`4546`: Remove ``Node.get_marker(name)`` the return value was not usable for more than an existence check.
40714071

40724072
Use ``Node.get_closest_marker(name)`` as a replacement.
40734073

doc/en/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
# The scheme of the identifier. Typical schemes are ISBN or URL.
342342
# epub_scheme = ''
343343

344-
# The unique identifier of the text. This can be a ISBN number
344+
# The unique identifier of the text. This can be an ISBN number
345345
# or the project homepage.
346346
# epub_identifier = ''
347347

doc/en/reference/reference.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,11 +1049,11 @@ Environment variables that can be used to change pytest's behavior.
10491049

10501050
.. envvar:: CI
10511051

1052-
When set (regardless of value), pytest acknowledges that is running in a CI process. Alterative to ``BUILD_NUMBER`` variable.
1052+
When set (regardless of value), pytest acknowledges that is running in a CI process. Alternative to ``BUILD_NUMBER`` variable.
10531053

10541054
.. envvar:: BUILD_NUMBER
10551055

1056-
When set (regardless of value), pytest acknowledges that is running in a CI process. Alterative to CI variable.
1056+
When set (regardless of value), pytest acknowledges that is running in a CI process. Alternative to CI variable.
10571057

10581058
.. envvar:: PYTEST_ADDOPTS
10591059

src/_pytest/capture.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def tell(self) -> int:
241241
raise UnsupportedOperation("redirected stdin is pseudofile, has no tell()")
242242

243243
def truncate(self, size: Optional[int] = None) -> int:
244-
raise UnsupportedOperation("cannont truncate stdin")
244+
raise UnsupportedOperation("cannot truncate stdin")
245245

246246
def write(self, data: str) -> int:
247247
raise UnsupportedOperation("cannot write to stdin")

src/_pytest/tmpdir.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def from_config(
100100
policy = config.getini("tmp_path_retention_policy")
101101
if policy not in ("all", "failed", "none"):
102102
raise ValueError(
103-
f"tmp_path_retention_policy must be either all, failed, none. Current intput: {policy}."
103+
f"tmp_path_retention_policy must be either all, failed, none. Current input: {policy}."
104104
)
105105

106106
return cls(

src/_pytest/warning_types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def warn_explicit_for(method: FunctionType, message: PytestWarning) -> None:
149149
"""
150150
Issue the warning :param:`message` for the definition of the given :param:`method`
151151
152-
this helps to log warnigns for functions defined prior to finding an issue with them
152+
this helps to log warnings for functions defined prior to finding an issue with them
153153
(like hook wrappers being marked in a legacy mechanism)
154154
"""
155155
lineno = method.__code__.co_firstlineno

testing/test_python_path.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test_no_ini(pytester: Pytester, file_structure) -> None:
8282

8383
def test_clean_up(pytester: Pytester) -> None:
8484
"""Test that the plugin cleans up after itself."""
85-
# This is tough to test behaviorly because the cleanup really runs last.
85+
# This is tough to test behaviorally because the cleanup really runs last.
8686
# So the test make several implementation assumptions:
8787
# - Cleanup is done in pytest_unconfigure().
8888
# - Not a hookwrapper.

0 commit comments

Comments
 (0)