Skip to content

Commit e11e0ae

Browse files
committed
Merge branch 'main' into gh-115999-tlbc-load-global
2 parents 852be38 + 32428cf commit e11e0ae

File tree

263 files changed

+2864
-2237
lines changed

Some content is hidden

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

263 files changed

+2864
-2237
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/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

Doc/library/ctypes.rst

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,12 +1707,6 @@ in :mod:`!ctypes`) which inherits from the private :class:`_CFuncPtr` class:
17071707
and raise an exception if the foreign function call failed.
17081708

17091709

1710-
.. exception:: ArgumentError
1711-
1712-
This exception is raised when a foreign function call cannot convert one of the
1713-
passed arguments.
1714-
1715-
17161710
.. audit-event:: ctypes.set_exception code foreign-functions
17171711

17181712
On Windows, when a foreign function call raises a system exception (for
@@ -1799,10 +1793,15 @@ different ways, depending on the type and number of the parameters in the call:
17991793
integer. *name* is name of the COM method. *iid* is an optional pointer to
18001794
the interface identifier which is used in extended error reporting.
18011795

1796+
If *iid* is not specified, an :exc:`OSError` is raised if the COM method
1797+
call fails. If *iid* is specified, a :exc:`~ctypes.COMError` is raised
1798+
instead.
1799+
18021800
COM methods use a special calling convention: They require a pointer to
18031801
the COM interface as first argument, in addition to those parameters that
18041802
are specified in the :attr:`!argtypes` tuple.
18051803

1804+
18061805
The optional *paramflags* parameter creates foreign function wrappers with much
18071806
more functionality than the features described above.
18081807

@@ -2741,3 +2740,39 @@ Arrays and pointers
27412740

27422741
Returns the object to which to pointer points. Assigning to this
27432742
attribute changes the pointer to point to the assigned object.
2743+
2744+
2745+
.. _ctypes-exceptions:
2746+
2747+
Exceptions
2748+
^^^^^^^^^^
2749+
2750+
.. exception:: ArgumentError
2751+
2752+
This exception is raised when a foreign function call cannot convert one of the
2753+
passed arguments.
2754+
2755+
2756+
.. exception:: COMError(hresult, text, details)
2757+
2758+
Windows only: This exception is raised when a COM method call failed.
2759+
2760+
.. attribute:: hresult
2761+
2762+
The integer value representing the error code.
2763+
2764+
.. attribute:: text
2765+
2766+
The error message.
2767+
2768+
.. attribute:: details
2769+
2770+
The 5-tuple ``(descr, source, helpfile, helpcontext, progid)``.
2771+
2772+
*descr* is the textual description. *source* is the language-dependent
2773+
``ProgID`` for the class or application that raised the error. *helpfile*
2774+
is the path of the help file. *helpcontext* is the help context
2775+
identifier. *progid* is the ``ProgID`` of the interface that defined the
2776+
error.
2777+
2778+
.. versionadded:: next

Doc/library/functools.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ The :mod:`functools` module defines the following functions:
481481
See :func:`itertools.accumulate` for an iterator that yields all intermediate
482482
values.
483483

484-
.. versionchanged:: next
484+
.. versionchanged:: 3.14
485485
*initial* is now supported as a keyword argument.
486486

487487
.. decorator:: singledispatch

0 commit comments

Comments
 (0)