Skip to content

Commit 7cb9f6a

Browse files
committed
Merge branch 'main' into globals-check-to-function-check
2 parents 2c0053c + 2b37996 commit 7cb9f6a

63 files changed

Lines changed: 960 additions & 483 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Doc/c-api/structures.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,20 +702,20 @@ Defining Getters and Setters
702702
703703
.. c:member:: void* closure
704704
705-
Optional function pointer, providing additional data for getter and setter.
705+
Optional user data pointer, providing additional data for getter and setter.
706706
707707
.. c:type:: PyObject *(*getter)(PyObject *, void *)
708708
709709
The ``get`` function takes one :c:expr:`PyObject*` parameter (the
710-
instance) and a function pointer (the associated ``closure``):
710+
instance) and a user data pointer (the associated ``closure``):
711711
712712
It should return a new reference on success or ``NULL`` with a set exception
713713
on failure.
714714
715715
.. c:type:: int (*setter)(PyObject *, PyObject *, void *)
716716
717717
``set`` functions take two :c:expr:`PyObject*` parameters (the instance and
718-
the value to be set) and a function pointer (the associated ``closure``):
718+
the value to be set) and a user data pointer (the associated ``closure``):
719719
720720
In case the attribute should be deleted the second parameter is ``NULL``.
721721
Should return ``0`` on success or ``-1`` with a set exception on failure.

Doc/library/asyncio-eventloop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ Opening network connections
626626
Added support for Windows.
627627

628628
.. versionchanged:: 3.11
629-
The *reuse_address* parameter, disabled since Python 3.9.0, 3.8.1,
629+
The *reuse_address* parameter, disabled since Python 3.8.1,
630630
3.7.6 and 3.6.10, has been entirely removed.
631631

632632
.. coroutinemethod:: loop.create_unix_connection(protocol_factory, \

Doc/library/audit_events.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Audit events table
77

88
This table contains all events raised by :func:`sys.audit` or
99
:c:func:`PySys_Audit` calls throughout the CPython runtime and the
10-
standard library. These calls were added in 3.8.0 or later (see :pep:`578`).
10+
standard library. These calls were added in 3.8 or later (see :pep:`578`).
1111

1212
See :func:`sys.addaudithook` and :c:func:`PySys_AddAuditHook` for
1313
information on handling these events.

Doc/library/decimal.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@ are also included in the pure Python version for compatibility.
15171517
the C version uses a thread-local rather than a coroutine-local context and the value
15181518
is ``False``. This is slightly faster in some nested context scenarios.
15191519

1520-
.. versionadded:: 3.9 backported to 3.7 and 3.8.
1520+
.. versionadded:: 3.8.3
15211521

15221522

15231523
Rounding modes

Doc/library/idle.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ in an editor window.
604604
The editing features described in previous subsections work when entering
605605
code interactively. IDLE's Shell window also responds to the following:
606606

607-
* :kbd:`C-c` attemps to interrupt statement execution (but may fail).
607+
* :kbd:`C-c` attempts to interrupt statement execution (but may fail).
608608

609609
* :kbd:`C-d` closes Shell if typed at a ``>>>`` prompt.
610610

Doc/library/ipaddress.rst

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,12 @@ write code that handles both IP versions correctly. Address objects are
121121
Leading zeros are tolerated, even in ambiguous cases that look like
122122
octal notation.
123123

124-
.. versionchanged:: 3.10
124+
.. versionchanged:: 3.9.5
125125

126126
Leading zeros are no longer tolerated and are treated as an error.
127127
IPv4 address strings are now parsed as strict as glibc
128128
:func:`~socket.inet_pton`.
129129

130-
.. versionchanged:: 3.9.5
131-
132-
The above change was also included in Python 3.9 starting with
133-
version 3.9.5.
134-
135-
.. versionchanged:: 3.8.12
136-
137-
The above change was also included in Python 3.8 starting with
138-
version 3.8.12.
139-
140130
.. attribute:: version
141131

142132
The appropriate version number: ``4`` for IPv4, ``6`` for IPv6.

Doc/library/pprint.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Functions
5959
The configuration parameters *stream*, *indent*, *width*, *depth*,
6060
*compact*, *sort_dicts* and *underscore_numbers* are passed to the
6161
:class:`PrettyPrinter` constructor and their meanings are as
62-
described in its documentation above.
62+
described in its documentation below.
6363

6464
>>> import pprint
6565
>>> stuff = ['spam', 'eggs', 'lumberjack', 'knights', 'ni']
@@ -78,7 +78,7 @@ Functions
7878
Return the formatted representation of *object* as a string. *indent*,
7979
*width*, *depth*, *compact*, *sort_dicts* and *underscore_numbers* are
8080
passed to the :class:`PrettyPrinter` constructor as formatting parameters
81-
and their meanings are as described in its documentation above.
81+
and their meanings are as described in its documentation below.
8282

8383

8484
.. function:: isreadable(object)

Doc/library/ssl.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,11 +737,11 @@ Constants
737737
When Python has been compiled against an older version of OpenSSL, the
738738
flag defaults to *0*.
739739

740-
.. versionadded:: 3.7
740+
.. versionadded:: 3.6.3
741741

742742
.. deprecated:: 3.7
743-
The option is deprecated since OpenSSL 1.1.0. It was added to 2.7.15,
744-
3.6.3 and 3.7.0 for backwards compatibility with OpenSSL 1.0.2.
743+
The option is deprecated since OpenSSL 1.1.0. It was added to 2.7.15 and
744+
3.6.3 for backwards compatibility with OpenSSL 1.0.2.
745745

746746
.. data:: OP_NO_RENEGOTIATION
747747

Doc/library/typing.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,6 @@ using ``[]``.
954954
be used for this concept instead. Type checkers should treat the two
955955
equivalently.
956956

957-
.. versionadded:: 3.5.4
958957
.. versionadded:: 3.6.2
959958

960959
.. data:: Self
@@ -3292,7 +3291,6 @@ Aliases to types in :mod:`collections`
32923291

32933292
Deprecated alias to :class:`collections.ChainMap`.
32943293

3295-
.. versionadded:: 3.5.4
32963294
.. versionadded:: 3.6.1
32973295

32983296
.. deprecated:: 3.9
@@ -3303,7 +3301,6 @@ Aliases to types in :mod:`collections`
33033301

33043302
Deprecated alias to :class:`collections.Counter`.
33053303

3306-
.. versionadded:: 3.5.4
33073304
.. versionadded:: 3.6.1
33083305

33093306
.. deprecated:: 3.9
@@ -3314,7 +3311,6 @@ Aliases to types in :mod:`collections`
33143311

33153312
Deprecated alias to :class:`collections.deque`.
33163313

3317-
.. versionadded:: 3.5.4
33183314
.. versionadded:: 3.6.1
33193315

33203316
.. deprecated:: 3.9
@@ -3389,7 +3385,7 @@ Aliases to container ABCs in :mod:`collections.abc`
33893385

33903386
Deprecated alias to :class:`collections.abc.Collection`.
33913387

3392-
.. versionadded:: 3.6.0
3388+
.. versionadded:: 3.6
33933389

33943390
.. deprecated:: 3.9
33953391
:class:`collections.abc.Collection` now supports subscripting (``[]``).
@@ -3681,7 +3677,6 @@ Aliases to :mod:`contextlib` ABCs
36813677
Deprecated alias to :class:`contextlib.AbstractContextManager`.
36823678

36833679
.. versionadded:: 3.5.4
3684-
.. versionadded:: 3.6.0
36853680

36863681
.. deprecated:: 3.9
36873682
:class:`contextlib.AbstractContextManager`
@@ -3692,7 +3687,6 @@ Aliases to :mod:`contextlib` ABCs
36923687

36933688
Deprecated alias to :class:`contextlib.AbstractAsyncContextManager`.
36943689

3695-
.. versionadded:: 3.5.4
36963690
.. versionadded:: 3.6.2
36973691

36983692
.. deprecated:: 3.9

Include/cpython/code.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ typedef struct {
7373
PyObject *_co_freevars;
7474
} _PyCoCached;
7575

76-
/* Ancilliary data structure used for instrumentation.
76+
/* Ancillary data structure used for instrumentation.
7777
Line instrumentation creates an array of
7878
these. One entry per code unit.*/
7979
typedef struct {

0 commit comments

Comments
 (0)