Skip to content

Commit 88274d6

Browse files
authored
Merge branch 'main' into int_freelist
2 parents 9f86b6e + 4803cd0 commit 88274d6

File tree

292 files changed

+4244
-2660
lines changed

Some content is hidden

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

292 files changed

+4244
-2660
lines changed

.github/CODEOWNERS

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,17 @@ Programs/_bootstrap_python.c @ericsnowcurrently
8181
Programs/python.c @ericsnowcurrently
8282
Tools/build/generate_global_objects.py @ericsnowcurrently
8383

84+
# Initialization
85+
Doc/library/sys_path_init.rst @FFY00
86+
Doc/c-api/init_config.rst @FFY00
87+
88+
# getpath
89+
**/*getpath* @FFY00
90+
91+
# site
92+
**/*site.py @FFY00
93+
Doc/library/site.rst @FFY00
94+
8495
# Exceptions
8596
Lib/test/test_except*.py @iritkatriel
8697
Objects/exceptions.c @iritkatriel
@@ -97,7 +108,7 @@ Modules/_hacl/** @gpshead
97108
**/*logging* @vsajip
98109

99110
# venv
100-
**/*venv* @vsajip
111+
**/*venv* @vsajip @FFY00
101112

102113
# Launcher
103114
/PC/launcher.c @vsajip

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
steps:
5454
- name: Install Git
5555
run: |
56-
apt install git -yq
56+
apt update && apt install git -yq
5757
git config --global --add safe.directory "$GITHUB_WORKSPACE"
5858
- uses: actions/checkout@v4
5959
with:

Doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ check: _ensure-pre-commit
294294

295295
.PHONY: serve
296296
serve:
297-
@echo "The serve target was removed, use htmlview instead (see bpo-36329)"
297+
@echo "The serve target was removed, use htmllive instead (see gh-80510)"
298298

299299
# Targets for daily automated doc build
300300
# By default, Sphinx only rebuilds pages where the page content has changed.

Doc/c-api/init.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,6 +1379,9 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
13791379
This function now calls the :c:member:`PyThreadState.on_delete` callback.
13801380
Previously, that happened in :c:func:`PyThreadState_Delete`.
13811381
1382+
.. versionchanged:: 3.13
1383+
The :c:member:`PyThreadState.on_delete` callback was removed.
1384+
13821385
13831386
.. c:function:: void PyThreadState_Delete(PyThreadState *tstate)
13841387

Doc/c-api/long.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
590590
return ``1`` when it's positive and ``0`` otherwise. Else set an
591591
exception and return ``-1``.
592592
593-
.. versionadded:: next
593+
.. versionadded:: 3.14
594594
595595
596596
.. c:function:: int PyLong_IsNegative(PyObject *obj)
@@ -601,7 +601,7 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
601601
return ``1`` when it's negative and ``0`` otherwise. Else set an
602602
exception and return ``-1``.
603603
604-
.. versionadded:: next
604+
.. versionadded:: 3.14
605605
606606
607607
.. c:function:: int PyLong_IsZero(PyObject *obj)
@@ -612,7 +612,7 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
612612
return ``1`` when it's zero and ``0`` otherwise. Else set an
613613
exception and return ``-1``.
614614
615-
.. versionadded:: next
615+
.. versionadded:: 3.14
616616
617617
618618
.. c:function:: PyObject* PyLong_GetInfo(void)

Doc/c-api/object.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,5 +597,5 @@ Object Protocol
597597
This function is intended to be used soon after *obj* is created,
598598
by the code that creates it.
599599
600-
.. versionadded:: next
600+
.. versionadded:: 3.14
601601

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ although there is currently no date scheduled for their removal.
145145
* ``splitvalue()``
146146
* ``to_bytes()``
147147

148-
* :mod:`urllib.request`: :class:`~urllib.request.URLopener` and
149-
:class:`~urllib.request.FancyURLopener` style of invoking requests is
150-
deprecated. Use newer :func:`~urllib.request.urlopen` functions and methods.
151-
152148
* :mod:`wsgiref`: ``SimpleHandler.stdout.write()`` should not do partial
153149
writes.
154150

Doc/library/asyncio-stream.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ and work with streams:
9292
family=socket.AF_UNSPEC, \
9393
flags=socket.AI_PASSIVE, sock=None, \
9494
backlog=100, ssl=None, reuse_address=None, \
95-
reuse_port=None, ssl_handshake_timeout=None, \
95+
reuse_port=None, keep_alive=None, \
96+
ssl_handshake_timeout=None, \
9697
ssl_shutdown_timeout=None, start_serving=True)
9798
9899
Start a socket server.
@@ -128,6 +129,9 @@ and work with streams:
128129
.. versionchanged:: 3.11
129130
Added the *ssl_shutdown_timeout* parameter.
130131

132+
.. versionchanged:: 3.13
133+
Added the *keep_alive* parameter.
134+
131135

132136
.. rubric:: Unix Sockets
133137

Doc/library/codecs.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,10 @@ is meant to be exhaustive. Notice that spelling alternatives that only differ in
10421042
case or use a hyphen instead of an underscore are also valid aliases; therefore,
10431043
e.g. ``'utf-8'`` is a valid alias for the ``'utf_8'`` codec.
10441044

1045+
On Windows, ``cpXXX`` codecs are available for all code pages.
1046+
But only codecs listed in the following table are guarantead to exist on
1047+
other platforms.
1048+
10451049
.. impl-detail::
10461050

10471051
Some common encodings can bypass the codecs lookup machinery to
@@ -1307,6 +1311,9 @@ particular, the following variants typically exist:
13071311
.. versionchanged:: 3.8
13081312
``cp65001`` is now an alias to ``utf_8``.
13091313

1314+
.. versionchanged:: 3.14
1315+
On Windows, ``cpXXX`` codecs are now available for all code pages.
1316+
13101317

13111318
Python Specific Encodings
13121319
-------------------------

Doc/library/concurrent.futures.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ Exception classes
690690
of a :class:`~concurrent.futures.InterpreterPoolExecutor`
691691
has failed initializing.
692692

693-
.. versionadded:: next
693+
.. versionadded:: 3.14
694694

695695
.. exception:: ExecutionFailed
696696

@@ -699,7 +699,7 @@ Exception classes
699699
:meth:`~concurrent.futures.Executor.submit` when there's an uncaught
700700
exception from the submitted task.
701701

702-
.. versionadded:: next
702+
.. versionadded:: 3.14
703703

704704
.. currentmodule:: concurrent.futures.process
705705

0 commit comments

Comments
 (0)