Skip to content

Commit 1e29e81

Browse files
authored
Merge branch 'main' into gh-125620
2 parents a3f1610 + aab3210 commit 1e29e81

File tree

698 files changed

+8273
-2219
lines changed

Some content is hidden

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

698 files changed

+8273
-2219
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ body:
3434
label: "CPython versions tested on:"
3535
multiple: true
3636
options:
37-
- "3.8"
3837
- "3.9"
3938
- "3.10"
4039
- "3.11"
4140
- "3.12"
4241
- "3.13"
42+
- "3.14"
4343
- "CPython main branch"
4444
validations:
4545
required: true

.github/ISSUE_TEMPLATE/crash.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ body:
2727
label: "CPython versions tested on:"
2828
multiple: true
2929
options:
30-
- "3.8"
3130
- "3.9"
3231
- "3.10"
3332
- "3.11"
3433
- "3.12"
3534
- "3.13"
35+
- "3.14"
3636
- "CPython main branch"
3737
validations:
3838
required: true

.github/workflows/mypy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v4
5454
- uses: actions/setup-python@v5
5555
with:
56-
python-version: "3.11"
56+
python-version: "3.13"
5757
cache: pip
5858
cache-dependency-path: Tools/requirements-dev.txt
5959
- run: pip install -r Tools/requirements-dev.txt

Doc/c-api/init.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ code, or when embedding the Python interpreter:
11951195
created by Python. Refer to
11961196
:ref:`cautions-regarding-runtime-finalization` for more details.
11971197
1198-
.. versionchanged:: next
1198+
.. versionchanged:: 3.14
11991199
Hangs the current thread, rather than terminating it, if called while the
12001200
interpreter is finalizing.
12011201
@@ -1257,7 +1257,7 @@ with sub-interpreters:
12571257
created by Python. Refer to
12581258
:ref:`cautions-regarding-runtime-finalization` for more details.
12591259
1260-
.. versionchanged:: next
1260+
.. versionchanged:: 3.14
12611261
Hangs the current thread, rather than terminating it, if called while the
12621262
interpreter is finalizing.
12631263
@@ -1547,7 +1547,7 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
15471547
:c:func:`Py_END_ALLOW_THREADS`, and :c:func:`PyGILState_Ensure`,
15481548
and terminate the current thread if called while the interpreter is finalizing.
15491549
1550-
.. versionchanged:: next
1550+
.. versionchanged:: 3.14
15511551
Hangs the current thread, rather than terminating it, if called while the
15521552
interpreter is finalizing.
15531553

Doc/c-api/init_config.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,14 +1825,18 @@ return ``-1`` on error:
18251825
PyInitConfig_Free(config);
18261826
return 0;
18271827
1828-
// Display the error message
1829-
const char *err_msg;
18301828
error:
1831-
(void)PyInitConfig_GetError(config, &err_msg);
1832-
printf("PYTHON INIT ERROR: %s\n", err_msg);
1833-
PyInitConfig_Free(config);
1829+
{
1830+
// Display the error message
1831+
// This uncommon braces style is used, because you cannot make
1832+
// goto targets point to variable declarations.
1833+
const char *err_msg;
1834+
(void)PyInitConfig_GetError(config, &err_msg);
1835+
printf("PYTHON INIT ERROR: %s\n", err_msg);
1836+
PyInitConfig_Free(config);
18341837
1835-
return -1;
1838+
return -1;
1839+
}
18361840
}
18371841
18381842

Doc/c-api/long.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
579579
On failure, return -1 with an exception set. This function always succeeds
580580
if *obj* is a :c:type:`PyLongObject` or its subtype.
581581
582-
.. versionadded:: next
582+
.. versionadded:: 3.14
583583
584584
585585
.. c:function:: PyObject* PyLong_GetInfo(void)

Doc/c-api/unicode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ PyUnicodeWriter
15751575
The :c:type:`PyUnicodeWriter` API can be used to create a Python :class:`str`
15761576
object.
15771577
1578-
.. versionadded:: next
1578+
.. versionadded:: 3.14
15791579
15801580
.. c:type:: PyUnicodeWriter
15811581

Doc/library/argparse.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,8 @@ FileType objects
18081808
Argument groups
18091809
^^^^^^^^^^^^^^^
18101810

1811-
.. method:: ArgumentParser.add_argument_group(title=None, description=None)
1811+
.. method:: ArgumentParser.add_argument_group(title=None, description=None, *, \
1812+
[argument_default], [conflict_handler])
18121813

18131814
By default, :class:`ArgumentParser` groups command-line arguments into
18141815
"positional arguments" and "options" when displaying help
@@ -1853,6 +1854,11 @@ Argument groups
18531854

18541855
--bar BAR bar help
18551856

1857+
The optional, keyword-only parameters argument_default_ and conflict_handler_
1858+
allow for finer-grained control of the behavior of the argument group. These
1859+
parameters have the same meaning as in the :class:`ArgumentParser` constructor,
1860+
but apply specifically to the argument group rather than the entire parser.
1861+
18561862
Note that any arguments not in your user-defined groups will end up back
18571863
in the usual "positional arguments" and "optional arguments" sections.
18581864

Doc/library/ast.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,7 @@ effects on the compilation of a program:
24912491
differ in whitespace or similar details. Attributes include line numbers
24922492
and column offsets.
24932493

2494-
.. versionadded:: next
2494+
.. versionadded:: 3.14
24952495

24962496

24972497
.. _ast-cli:

Doc/library/ctypes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,7 @@ These are the fundamental ctypes data types:
23032303
Represents the C :c:expr:`double complex` datatype, if available. The
23042304
constructor accepts an optional :class:`complex` initializer.
23052305

2306-
.. versionadded:: next
2306+
.. versionadded:: 3.14
23072307

23082308

23092309
.. class:: c_float_complex

0 commit comments

Comments
 (0)