Skip to content

Commit ffcb68e

Browse files
Merge branch 'llvm-20' of https://github.com/savannahostrowski/cpython into llvm-20
2 parents 4b35c2f + f3d46bd commit ffcb68e

Some content is hidden

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

58 files changed

+578
-266
lines changed

Doc/c-api/iter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ There are two functions specifically for working with iterators.
5454
5555
- ``PYGEN_RETURN`` if iterator returns. Return value is returned via *presult*.
5656
- ``PYGEN_NEXT`` if iterator yields. Yielded value is returned via *presult*.
57-
- ``PYGEN_ERROR`` if iterator has raised and exception. *presult* is set to ``NULL``.
57+
- ``PYGEN_ERROR`` if iterator has raised an exception. *presult* is set to ``NULL``.
5858
5959
.. versionadded:: 3.10

Doc/deprecations/pending-removal-in-3.15.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Pending removal in Python 3.15
9292
Use ``class TD(TypedDict): pass`` or ``TD = TypedDict("TD", {})``
9393
to create a TypedDict with zero field.
9494

95-
* The :func:`typing.no_type_check_decorator` decorator function
95+
* The :func:`!typing.no_type_check_decorator` decorator function
9696
has been deprecated since Python 3.13.
9797
After eight years in the :mod:`typing` module,
9898
it has yet to be supported by any major type checker.

Doc/deprecations/pending-removal-in-3.20.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Pending removal in Python 3.20
88
- :mod:`argparse`
99
- :mod:`csv`
1010
- :mod:`!ctypes.macholib`
11+
- :mod:`imaplib`
1112
- :mod:`ipaddress`
1213
- :mod:`json`
1314
- :mod:`logging` (``__date__`` also deprecated)

Doc/faq/general.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ How do I get documentation on Python?
186186
-------------------------------------
187187

188188
The standard documentation for the current stable version of Python is available
189-
at https://docs.python.org/3/. PDF, plain text, and downloadable HTML versions are
189+
at https://docs.python.org/3/. EPUB, plain text, and downloadable HTML versions are
190190
also available at https://docs.python.org/3/download.html.
191191

192192
The documentation is written in reStructuredText and processed by `the Sphinx

Doc/library/functools.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ The :mod:`functools` module defines the following functions:
190190

191191
Note, type specificity applies only to the function's immediate arguments
192192
rather than their contents. The scalar arguments, ``Decimal(42)`` and
193-
``Fraction(42)`` are be treated as distinct calls with distinct results.
193+
``Fraction(42)`` are treated as distinct calls with distinct results.
194194
In contrast, the tuple arguments ``('answer', Decimal(42))`` and
195195
``('answer', Fraction(42))`` are treated as equivalent.
196196

Doc/library/glob.rst

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,27 @@
1818
single: - (minus); in glob-style wildcards
1919
single: . (dot); in glob-style wildcards
2020

21-
The :mod:`glob` module finds all the pathnames matching a specified pattern
22-
according to the rules used by the Unix shell, although results are returned in
23-
arbitrary order. No tilde expansion is done, but ``*``, ``?``, and character
21+
The :mod:`!glob` module finds pathnames
22+
using pattern matching rules similar to the Unix shell.
23+
No tilde expansion is done, but ``*``, ``?``, and character
2424
ranges expressed with ``[]`` will be correctly matched. This is done by using
2525
the :func:`os.scandir` and :func:`fnmatch.fnmatch` functions in concert, and
2626
not by actually invoking a subshell.
2727

28-
Note that files beginning with a dot (``.``) can only be matched by
28+
.. note::
29+
The pathnames are returned in no particular order. If you need a specific
30+
order, sort the results.
31+
32+
Files beginning with a dot (``.``) can only be matched by
2933
patterns that also start with a dot,
3034
unlike :func:`fnmatch.fnmatch` or :func:`pathlib.Path.glob`.
31-
(For tilde and shell variable expansion, use :func:`os.path.expanduser` and
32-
:func:`os.path.expandvars`.)
35+
For tilde and shell variable expansion, use :func:`os.path.expanduser` and
36+
:func:`os.path.expandvars`.
3337

3438
For a literal match, wrap the meta-characters in brackets.
3539
For example, ``'[?]'`` matches the character ``'?'``.
3640

37-
The :mod:`glob` module defines the following functions:
41+
The :mod:`!glob` module defines the following functions:
3842

3943

4044
.. function:: glob(pathname, *, root_dir=None, dir_fd=None, recursive=False, \
@@ -51,7 +55,7 @@ The :mod:`glob` module defines the following functions:
5155

5256
If *root_dir* is not ``None``, it should be a :term:`path-like object`
5357
specifying the root directory for searching. It has the same effect on
54-
:func:`glob` as changing the current directory before calling it. If
58+
:func:`!glob` as changing the current directory before calling it. If
5559
*pathname* is relative, the result will contain paths relative to
5660
*root_dir*.
5761

Doc/library/os.rst

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3451,7 +3451,10 @@ features:
34513451

34523452
.. attribute:: stx_mnt_id
34533453

3454-
Mount ID.
3454+
Mount identifier.
3455+
3456+
Equal to ``None`` if :data:`STATX_MNT_ID` is missing from
3457+
:attr:`~os.statx_result.stx_mask`.
34553458

34563459
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34573460
userspace API headers >= 5.8.
@@ -3460,19 +3463,28 @@ features:
34603463

34613464
Direct I/O memory buffer alignment requirement.
34623465

3466+
Equal to ``None`` if :data:`STATX_DIOALIGN` is missing from
3467+
:attr:`~os.statx_result.stx_mask`.
3468+
34633469
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34643470
userspace API headers >= 6.1.
34653471

34663472
.. attribute:: stx_dio_offset_align
34673473

34683474
Direct I/O file offset alignment requirement.
34693475

3476+
Equal to ``None`` if :data:`STATX_DIOALIGN` is missing from
3477+
:attr:`~os.statx_result.stx_mask`.
3478+
34703479
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34713480
userspace API headers >= 6.1.
34723481

34733482
.. attribute:: stx_subvol
34743483

3475-
Subvolume ID.
3484+
Subvolume identifier.
3485+
3486+
Equal to ``None`` if :data:`STATX_SUBVOL` is missing from
3487+
:attr:`~os.statx_result.stx_mask`.
34763488

34773489
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34783490
userspace API headers >= 6.10.
@@ -3481,34 +3493,49 @@ features:
34813493

34823494
Minimum size for direct I/O with torn-write protection.
34833495

3496+
Equal to ``None`` if :data:`STATX_WRITE_ATOMIC` is missing from
3497+
:attr:`~os.statx_result.stx_mask`.
3498+
34843499
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34853500
userspace API headers >= 6.11.
34863501

34873502
.. attribute:: stx_atomic_write_unit_max
34883503

34893504
Maximum size for direct I/O with torn-write protection.
34903505

3506+
Equal to ``None`` if :data:`STATX_WRITE_ATOMIC` is missing from
3507+
:attr:`~os.statx_result.stx_mask`.
3508+
34913509
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34923510
userspace API headers >= 6.11.
34933511

34943512
.. attribute:: stx_atomic_write_unit_max_opt
34953513

34963514
Maximum optimized size for direct I/O with torn-write protection.
34973515

3516+
Equal to ``None`` if :data:`STATX_WRITE_ATOMIC` is missing from
3517+
:attr:`~os.statx_result.stx_mask`.
3518+
34983519
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
34993520
userspace API headers >= 6.16.
35003521

35013522
.. attribute:: stx_atomic_write_segments_max
35023523

35033524
Maximum iovecs for direct I/O with torn-write protection.
35043525

3526+
Equal to ``None`` if :data:`STATX_WRITE_ATOMIC` is missing from
3527+
:attr:`~os.statx_result.stx_mask`.
3528+
35053529
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
35063530
userspace API headers >= 6.11.
35073531

35083532
.. attribute:: stx_dio_read_offset_align
35093533

35103534
Direct I/O file offset alignment requirement for reads.
35113535

3536+
Equal to ``None`` if :data:`STATX_DIO_READ_ALIGN` is missing from
3537+
:attr:`~os.statx_result.stx_mask`.
3538+
35123539
.. availability:: Linux >= 4.11 with glibc >= 2.28 and build-time kernel
35133540
userspace API headers >= 6.14.
35143541

Doc/library/resource.rst

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ platform.
141141
.. data:: RLIMIT_CPU
142142

143143
The maximum amount of processor time (in seconds) that a process can use. If
144-
this limit is exceeded, a :const:`SIGXCPU` signal is sent to the process. (See
144+
this limit is exceeded, a :const:`~signal.SIGXCPU` signal is sent to the process. (See
145145
the :mod:`signal` module documentation for information about how to catch this
146146
signal and do something useful, e.g. flush open files to disk.)
147147

@@ -363,47 +363,47 @@ These functions are used to retrieve resource usage information:
363363
For backward compatibility, the return value is also accessible as a tuple of 16
364364
elements.
365365

366-
The fields :attr:`ru_utime` and :attr:`ru_stime` of the return value are
366+
The fields :attr:`!ru_utime` and :attr:`!ru_stime` of the return value are
367367
floating-point values representing the amount of time spent executing in user
368368
mode and the amount of time spent executing in system mode, respectively. The
369369
remaining values are integers. Consult the :manpage:`getrusage(2)` man page for
370370
detailed information about these values. A brief summary is presented here:
371371

372-
+--------+---------------------+---------------------------------------+
373-
| Index | Field | Resource |
374-
+========+=====================+=======================================+
375-
| ``0`` | :attr:`ru_utime` | time in user mode (float seconds) |
376-
+--------+---------------------+---------------------------------------+
377-
| ``1`` | :attr:`ru_stime` | time in system mode (float seconds) |
378-
+--------+---------------------+---------------------------------------+
379-
| ``2`` | :attr:`ru_maxrss` | maximum resident set size |
380-
+--------+---------------------+---------------------------------------+
381-
| ``3`` | :attr:`ru_ixrss` | shared memory size |
382-
+--------+---------------------+---------------------------------------+
383-
| ``4`` | :attr:`ru_idrss` | unshared memory size |
384-
+--------+---------------------+---------------------------------------+
385-
| ``5`` | :attr:`ru_isrss` | unshared stack size |
386-
+--------+---------------------+---------------------------------------+
387-
| ``6`` | :attr:`ru_minflt` | page faults not requiring I/O |
388-
+--------+---------------------+---------------------------------------+
389-
| ``7`` | :attr:`ru_majflt` | page faults requiring I/O |
390-
+--------+---------------------+---------------------------------------+
391-
| ``8`` | :attr:`ru_nswap` | number of swap outs |
392-
+--------+---------------------+---------------------------------------+
393-
| ``9`` | :attr:`ru_inblock` | block input operations |
394-
+--------+---------------------+---------------------------------------+
395-
| ``10`` | :attr:`ru_oublock` | block output operations |
396-
+--------+---------------------+---------------------------------------+
397-
| ``11`` | :attr:`ru_msgsnd` | messages sent |
398-
+--------+---------------------+---------------------------------------+
399-
| ``12`` | :attr:`ru_msgrcv` | messages received |
400-
+--------+---------------------+---------------------------------------+
401-
| ``13`` | :attr:`ru_nsignals` | signals received |
402-
+--------+---------------------+---------------------------------------+
403-
| ``14`` | :attr:`ru_nvcsw` | voluntary context switches |
404-
+--------+---------------------+---------------------------------------+
405-
| ``15`` | :attr:`ru_nivcsw` | involuntary context switches |
406-
+--------+---------------------+---------------------------------------+
372+
+--------+----------------------+---------------------------------------+
373+
| Index | Field | Resource |
374+
+========+======================+=======================================+
375+
| ``0`` | :attr:`!ru_utime` | time in user mode (float seconds) |
376+
+--------+----------------------+---------------------------------------+
377+
| ``1`` | :attr:`!ru_stime` | time in system mode (float seconds) |
378+
+--------+----------------------+---------------------------------------+
379+
| ``2`` | :attr:`!ru_maxrss` | maximum resident set size |
380+
+--------+----------------------+---------------------------------------+
381+
| ``3`` | :attr:`!ru_ixrss` | shared memory size |
382+
+--------+----------------------+---------------------------------------+
383+
| ``4`` | :attr:`!ru_idrss` | unshared memory size |
384+
+--------+----------------------+---------------------------------------+
385+
| ``5`` | :attr:`!ru_isrss` | unshared stack size |
386+
+--------+----------------------+---------------------------------------+
387+
| ``6`` | :attr:`!ru_minflt` | page faults not requiring I/O |
388+
+--------+----------------------+---------------------------------------+
389+
| ``7`` | :attr:`!ru_majflt` | page faults requiring I/O |
390+
+--------+----------------------+---------------------------------------+
391+
| ``8`` | :attr:`!ru_nswap` | number of swap outs |
392+
+--------+----------------------+---------------------------------------+
393+
| ``9`` | :attr:`!ru_inblock` | block input operations |
394+
+--------+----------------------+---------------------------------------+
395+
| ``10`` | :attr:`!ru_oublock` | block output operations |
396+
+--------+----------------------+---------------------------------------+
397+
| ``11`` | :attr:`!ru_msgsnd` | messages sent |
398+
+--------+----------------------+---------------------------------------+
399+
| ``12`` | :attr:`!ru_msgrcv` | messages received |
400+
+--------+----------------------+---------------------------------------+
401+
| ``13`` | :attr:`!ru_nsignals` | signals received |
402+
+--------+----------------------+---------------------------------------+
403+
| ``14`` | :attr:`!ru_nvcsw` | voluntary context switches |
404+
+--------+----------------------+---------------------------------------+
405+
| ``15`` | :attr:`!ru_nivcsw` | involuntary context switches |
406+
+--------+----------------------+---------------------------------------+
407407

408408
This function will raise a :exc:`ValueError` if an invalid *who* parameter is
409409
specified. It may also raise :exc:`error` exception in unusual circumstances.

Doc/library/signal.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ The variables defined in the :mod:`signal` module are:
265265

266266
.. availability:: Unix.
267267

268+
.. data:: SIGXCPU
269+
270+
CPU time limit exceeded.
271+
272+
.. availability:: Unix.
273+
268274
.. data:: SIG*
269275

270276
All the signal numbers are defined symbolically. For example, the hangup signal

Doc/library/typing.rst

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,17 +3258,6 @@ Functions and decorators
32583258

32593259
``@no_type_check`` mutates the decorated object in place.
32603260

3261-
.. decorator:: no_type_check_decorator
3262-
3263-
Decorator to give another decorator the :func:`no_type_check` effect.
3264-
3265-
This wraps the decorator with something that wraps the decorated
3266-
function in :func:`no_type_check`.
3267-
3268-
.. deprecated-removed:: 3.13 3.15
3269-
No type checker ever added support for ``@no_type_check_decorator``. It
3270-
is therefore deprecated, and will be removed in Python 3.15.
3271-
32723261
.. decorator:: override
32733262

32743263
Decorator to indicate that a method in a subclass is intended to override a
@@ -3354,7 +3343,8 @@ Introspection helpers
33543343
``__annotations__`` dictionaries. Annotations on classes appearing
33553344
earlier in the :term:`method resolution order` always take precedence over
33563345
annotations on classes appearing later in the method resolution order.
3357-
* The function recursively replaces all occurrences of ``Annotated[T, ...]``
3346+
* The function recursively replaces all occurrences of
3347+
``Annotated[T, ...]``, ``Required[T]``, ``NotRequired[T]``, and ``ReadOnly[T]``
33583348
with ``T``, unless *include_extras* is set to ``True`` (see
33593349
:class:`Annotated` for more information).
33603350

@@ -4113,10 +4103,6 @@ convenience. This is subject to change, and not all deprecations are listed.
41134103
- 3.12
41144104
- Undecided
41154105
- :pep:`695`
4116-
* - :func:`@typing.no_type_check_decorator <no_type_check_decorator>`
4117-
- 3.13
4118-
- 3.15
4119-
- :gh:`106309`
41204106
* - :data:`typing.AnyStr`
41214107
- 3.13
41224108
- 3.18

0 commit comments

Comments
 (0)