Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/library/ctypes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ Keep in mind that retrieving sub-objects from Structure, Unions, and Arrays
doesn't *copy* the sub-object, instead it retrieves a wrapper object accessing
the root-object's underlying buffer.

Another example that may behave different from what one would expect is this::
Another example that may behave differently from what one would expect is this::

>>> s = c_char_p()
>>> s.value = b"abc def ghi"
Expand Down
2 changes: 1 addition & 1 deletion Lib/collections/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ def __getnewargs__(self):
'__slots__': (),
'_fields': field_names,
'_field_defaults': field_defaults,
# alternate spelling for backward compatiblity
# alternate spelling for backward compatibility
'_fields_defaults': field_defaults,
'__new__': __new__,
'_make': _make,
Expand Down
2 changes: 1 addition & 1 deletion Lib/dataclasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ class C(Base):
raise TypeError(f'Invalid field: {item!r}')

if not isinstance(name, str) or not name.isidentifier():
raise TypeError(f'Field names must be valid identifers: {name!r}')
raise TypeError(f'Field names must be valid identifiers: {name!r}')
if keyword.iskeyword(name):
raise TypeError(f'Field names must not be keywords: {name!r}')
if name in seen:
Expand Down
2 changes: 1 addition & 1 deletion Lib/email/headerregistry.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def fold(self, *, policy):
the header name and the ': ' separator.

"""
# At some point we need to put fws here iif it was in the source.
# At some point we need to put fws here if it was in the source.
header = parser.Header([
parser.HeaderLabel([
parser.ValueTerminal(self.name, 'header-name'),
Expand Down
2 changes: 1 addition & 1 deletion Lib/importlib/_bootstrap_external.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.7a2 3391 (update GET_AITER #31709)
# Python 3.7a4 3392 (PEP 552: Deterministic pycs #31650)
# Python 3.7b1 3393 (remove STORE_ANNOTATION opcode #32550)
# Python 3.7b5 3394 (restored docstring as the firts stmt in the body;
# Python 3.7b5 3394 (restored docstring as the first stmt in the body;
# this might affected the first line number #32911)
#
# MAGIC must change whenever the bytecode emitted by the compiler may no
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/support/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2806,7 +2806,7 @@ def fd_count():
if sys.platform.startswith(('linux', 'freebsd')):
try:
names = os.listdir("/proc/self/fd")
# Substract one because listdir() opens internally a file
# Subtract one because listdir() internally opens a file
# descriptor to list the content of the /proc/self/fd/ directory.
return len(names) - 1
except FileNotFoundError:
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_dataclasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -3037,11 +3037,11 @@ def test_keyword_field_names(self):
def test_non_identifier_field_names(self):
for field in ['()', 'x,y', '*', '2@3', '', 'little johnny tables']:
with self.subTest(field=field):
with self.assertRaisesRegex(TypeError, 'must be valid identifers'):
with self.assertRaisesRegex(TypeError, 'must be valid identifiers'):
make_dataclass('C', ['a', field])
with self.assertRaisesRegex(TypeError, 'must be valid identifers'):
with self.assertRaisesRegex(TypeError, 'must be valid identifiers'):
make_dataclass('C', [field])
with self.assertRaisesRegex(TypeError, 'must be valid identifers'):
with self.assertRaisesRegex(TypeError, 'must be valid identifiers'):
make_dataclass('C', [field, 'a'])

def test_underscore_field_names(self):
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_eintr.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def test_all(self):
print()
print("--- run eintr_tester.py ---", flush=True)
# In verbose mode, the child process inherit stdout and stdout,
# to see output in realtime and reduce the risk of loosing output.
# to see output in realtime and reduce the risk of losing output.
args = [sys.executable, "-E", "-X", "faulthandler", *args]
proc = subprocess.run(args)
print(f"--- eintr_tester.py completed: "
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_random.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def test_choices(self):
choices([], cum_weights=[], k=5)

def test_choices_subnormal(self):
# Subnormal weights would occassionally trigger an IndexError
# Subnormal weights would occasionally trigger an IndexError
# in choices() when the value returned by random() was large
# enough to make `random() * total` round up to the total.
# See https://bugs.python.org/msg275594 for more detail.
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.5.2rc1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,7 @@ Adds validation of ucrtbase[d].dll version with warning for old versions.
.. nonce: 102DA-
.. section: Build

Avoid error about nonexistant fileblocks.o file by using a lower-level check
Avoid error about nonexistent fileblocks.o file by using a lower-level check
for st_blocks in struct stat.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.6.0a1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3695,7 +3695,7 @@ Adds validation of ucrtbase[d].dll version with warning for old versions.
.. nonce: 102DA-
.. section: Build

Avoid error about nonexistant fileblocks.o file by using a lower-level check
Avoid error about nonexistent fileblocks.o file by using a lower-level check
for st_blocks in struct stat.

..
Expand Down
3 changes: 1 addition & 2 deletions Misc/NEWS.d/3.6.3rc1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -885,8 +885,7 @@ The affected events are '<<force-open-completions>>', '<<expand-word>>',
'<<run-module>>', '<<check-module>>', and '<<zoom-height>>'. Any (global)
customizations made before 3.6.3 will not affect their keyset-specific
customization after 3.6.3. and vice versa.

Inital patch by Charles Wohlganger.
Initial patch by Charles Wohlganger.

..

Expand Down
2 changes: 1 addition & 1 deletion Modules/_pickle.c
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@ save_long(PicklerObject *self, PyObject *obj)
/* How many bytes do we need? There are nbits >> 3 full
* bytes of data, and nbits & 7 leftover bits. If there
* are any leftover bits, then we clearly need another
* byte. Wnat's not so obvious is that we *probably*
* byte. What's not so obvious is that we *probably*
* need another byte even if there aren't any leftovers:
* the most-significant bit of the most-significant byte
* acts like a sign bit, and it's usually got a sense
Expand Down