Skip to content

Commit a7aa921

Browse files
committed
Merge branch 'master' into fix-pydecimal-sigs/117056
2 parents dac8e43 + eac37b4 commit a7aa921

File tree

115 files changed

+5226
-1691
lines changed

Some content is hidden

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

115 files changed

+5226
-1691
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/python/devcontainer:2025.05.29.15334414373",
2+
"image": "ghcr.io/python/devcontainer:latest",
33
"onCreateCommand": [
44
// Install common tooling.
55
"dnf",

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ jobs:
270270
fail-fast: false
271271
matrix:
272272
os: [ubuntu-24.04]
273-
openssl_ver: [3.0.16, 3.1.8, 3.2.4, 3.3.3, 3.4.1]
273+
openssl_ver: [3.0.17, 3.2.5, 3.3.4, 3.4.2, 3.5.2]
274274
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
275275
env:
276276
OPENSSL_VER: ${{ matrix.openssl_ver }}

.github/workflows/mypy.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ on:
1313
- "Lib/test/libregrtest/**"
1414
- "Lib/tomllib/**"
1515
- "Misc/mypy/**"
16-
- "Tools/build/mypy.ini"
1716
- "Tools/build/check_extension_modules.py"
17+
- "Tools/build/check_warnings.py"
1818
- "Tools/build/compute-changes.py"
1919
- "Tools/build/deepfreeze.py"
20+
- "Tools/build/generate-build-details.py"
2021
- "Tools/build/generate_sbom.py"
2122
- "Tools/build/generate_stdlib_module_names.py"
22-
- "Tools/build/generate-build-details.py"
23-
- "Tools/build/verify_ensurepip_wheels.py"
24-
- "Tools/build/update_file.py"
23+
- "Tools/build/mypy.ini"
2524
- "Tools/build/umarshal.py"
25+
- "Tools/build/update_file.py"
26+
- "Tools/build/verify_ensurepip_wheels.py"
2627
- "Tools/cases_generator/**"
2728
- "Tools/clinic/**"
2829
- "Tools/jit/**"

Doc/bugs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ tracker <https://github.com/python/python-docs-theme>`_.
3737
`Helping with Documentation <https://devguide.python.org/docquality/#helping-with-documentation>`_
3838
Comprehensive guide for individuals that are interested in contributing to Python documentation.
3939

40-
`Documentation Translations <https://devguide.python.org/documentation/translating/>`_
41-
A list of GitHub pages for documentation translation and their primary contacts.
40+
`Documentation Translations <https://devguide.python.org/documentation/translations/translating/#translation-coordinators>`_
41+
A list of GitHub pages for documentation translation and their coordination teams.
4242

4343

4444
.. _using-the-tracker:

Doc/howto/remote_debugging.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,13 @@ To locate a thread:
374374
reliable thread to target.
375375

376376
3. Optionally, use the offset ``interpreter_state.threads_head`` to iterate
377-
through the linked list of all thread states. Each ``PyThreadState`` structure
378-
contains a ``native_thread_id`` field, which may be compared to a target thread
379-
ID to find a specific thread.
377+
through the linked list of all thread states. Each ``PyThreadState``
378+
structure contains a ``native_thread_id`` field, which may be compared to
379+
a target thread ID to find a specific thread.
380380

381-
1. Once a valid ``PyThreadState`` has been found, its address can be used in
382-
later steps of the protocol, such as writing debugger control fields and
383-
scheduling execution.
381+
4. Once a valid ``PyThreadState`` has been found, its address can be used in
382+
later steps of the protocol, such as writing debugger control fields and
383+
scheduling execution.
384384

385385
The following is an example implementation that locates the main thread state::
386386

@@ -454,15 +454,15 @@ its fields are defined by the ``_Py_DebugOffsets`` structure and include the
454454
following:
455455

456456
- ``debugger_script_path``: A fixed-size buffer that holds the full path to a
457-
Python source file (``.py``). This file must be accessible and readable by
458-
the target process when execution is triggered.
457+
Python source file (``.py``). This file must be accessible and readable by
458+
the target process when execution is triggered.
459459

460460
- ``debugger_pending_call``: An integer flag. Setting this to ``1`` tells the
461-
interpreter that a script is ready to be executed.
461+
interpreter that a script is ready to be executed.
462462

463463
- ``eval_breaker``: A field checked by the interpreter during execution.
464-
Setting bit 5 (``_PY_EVAL_PLEASE_STOP_BIT``, value ``1U << 5``) in this
465-
field causes the interpreter to pause and check for debugger activity.
464+
Setting bit 5 (``_PY_EVAL_PLEASE_STOP_BIT``, value ``1U << 5``) in this
465+
field causes the interpreter to pause and check for debugger activity.
466466

467467
To complete the injection, the debugger must perform the following steps:
468468

Doc/library/asyncio-protocol.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,11 @@ Subprocess Transports
390390
Return the transport for the communication pipe corresponding to the
391391
integer file descriptor *fd*:
392392

393-
* ``0``: readable streaming transport of the standard input (*stdin*),
393+
* ``0``: writable streaming transport of the standard input (*stdin*),
394394
or :const:`None` if the subprocess was not created with ``stdin=PIPE``
395-
* ``1``: writable streaming transport of the standard output (*stdout*),
395+
* ``1``: readable streaming transport of the standard output (*stdout*),
396396
or :const:`None` if the subprocess was not created with ``stdout=PIPE``
397-
* ``2``: writable streaming transport of the standard error (*stderr*),
397+
* ``2``: readable streaming transport of the standard error (*stderr*),
398398
or :const:`None` if the subprocess was not created with ``stderr=PIPE``
399399
* other *fd*: :const:`None`
400400

Doc/library/asyncio-sync.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Event
157157

158158
Clear (unset) the event.
159159

160-
Tasks awaiting on :meth:`~Event.wait` will now block until the
160+
Subsequent tasks awaiting on :meth:`~Event.wait` will now block until the
161161
:meth:`~Event.set` method is called again.
162162

163163
.. method:: is_set()

Doc/library/cmdlinelibs.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _cmdlinelibs:
22

33
********************************
4-
Command Line Interface Libraries
4+
Command-line interface libraries
55
********************************
66

77
The modules described in this chapter assist with implementing
@@ -19,3 +19,4 @@ Here's an overview:
1919
curses.rst
2020
curses.ascii.rst
2121
curses.panel.rst
22+
cmd.rst

Doc/library/concurrent.futures.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ Executor Objects
101101
executor has started running will be completed prior to this method
102102
returning. The remaining futures are cancelled.
103103

104-
You can avoid having to call this method explicitly if you use the
105-
:keyword:`with` statement, which will shutdown the :class:`Executor`
106-
(waiting as if :meth:`Executor.shutdown` were called with *wait* set to
107-
``True``)::
104+
You can avoid having to call this method explicitly if you use the executor
105+
as a :term:`context manager` via the :keyword:`with` statement, which
106+
will shutdown the :class:`Executor` (waiting as if :meth:`Executor.shutdown`
107+
were called with *wait* set to ``True``)::
108108

109109
import shutil
110110
with ThreadPoolExecutor(max_workers=4) as e:

Doc/library/constants.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,17 @@ should not be used in programs.
9797
exit(code=None)
9898

9999
Objects that when printed, print a message like "Use quit() or Ctrl-D
100-
(i.e. EOF) to exit", and when called, raise :exc:`SystemExit` with the
100+
(i.e. EOF) to exit", and when accessed directly in the interactive
101+
interpreter or called as functions, raise :exc:`SystemExit` with the
101102
specified exit code.
102103

103104
.. data:: help
104105
:noindex:
105106

106107
Object that when printed, prints the message "Type help() for interactive
107-
help, or help(object) for help about object.", and when called,
108-
acts as described :func:`elsewhere <help>`.
108+
help, or help(object) for help about object.", and when accessed directly
109+
in the interactive interpreter, invokes the built-in help system
110+
(see :func:`help`).
109111

110112
.. data:: copyright
111113
credits

0 commit comments

Comments
 (0)