Skip to content

Commit 65dc847

Browse files
authored
Merge branch 'main' into gh-161081-copydata-shape
2 parents fb27e62 + 2d862b1 commit 65dc847

642 files changed

Lines changed: 9379 additions & 2415 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,11 @@ Lib/_markupbase.py @ezio-melotti
498498
Lib/test/test_html*.py @ezio-melotti
499499
Tools/build/parse_html5_entities.py @ezio-melotti
500500

501+
# HTTP
502+
Doc/library/http* @orsenthil
503+
Lib/http/ @orsenthil
504+
Lib/test/test_http*.py @orsenthil
505+
501506
# IDLE
502507
Doc/library/idle.rst @terryjreedy
503508
Lib/idlelib/ @terryjreedy
@@ -633,6 +638,11 @@ Modules/_typesmodule.c @AA-Turner
633638
Lib/unittest/mock.py @cjw296
634639
Lib/test/test_unittest/testmock/ @cjw296
635640

641+
# Urllib
642+
Doc/library/urllib* @orsenthil
643+
Lib/urllib/ @orsenthil
644+
Lib/test/test_urllib*.py @orsenthil
645+
636646
# Venv
637647
**/*venv* @vsajip @FFY00
638648

‎.github/workflows/reusable-wasi.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,4 @@ jobs:
6464
- name: "Display build info of the host/WASI Python"
6565
run: python3 Platforms/WASI pythoninfo-host
6666
- name: "Test"
67-
run: |
68-
CROSS_BUILD_WASI=$(python3 Platforms/WASI path)
69-
make --directory "${CROSS_BUILD_WASI}" test
67+
run: python3 Platforms/WASI test

‎Doc/builtins/functions.rst‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ are always available. They are listed here in alphabetical order.
740740
This function supports dynamic execution of Python code. *source* must be
741741
either a string or a code object. If it is a string, the string is parsed as
742742
a suite of Python statements which is then executed (unless a syntax error
743-
occurs). [#]_ If it is a code object, it is simply executed. In all cases,
743+
occurs). If it is a code object, it is simply executed. In all cases,
744744
the code that's executed is expected to be valid as file input (see the
745745
section :ref:`file-input` in the Reference Manual). Be aware that the
746746
:keyword:`nonlocal`, :keyword:`yield`, and :keyword:`return`
@@ -1950,7 +1950,7 @@ are always available. They are listed here in alphabetical order.
19501950
>>> MISSING
19511951
<MISSING>
19521952

1953-
Sentinel objects are truthy and compare equal only to themselves. They are
1953+
Sentinel objects are true and compare equal only to themselves. They are
19541954
intended to be compared with the :keyword:`is` operator.
19551955

19561956
``sentinel`` does not support subclassing.
@@ -2470,9 +2470,3 @@ are always available. They are listed here in alphabetical order.
24702470
.. versionchanged:: 3.9
24712471
When the command line options :option:`-E` or :option:`-I` are being used,
24722472
the environment variable :envvar:`PYTHONCASEOK` is now ignored.
2473-
2474-
.. rubric:: Footnotes
2475-
2476-
.. [#] Note that the parser only accepts the Unix-style end of line convention.
2477-
If you are reading the code from a file, make sure to use newline conversion
2478-
mode to convert Windows or Mac-style newlines.

‎Doc/builtins/stdtypes.rst‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,8 +1225,8 @@ the underlying generator function:
12251225
If the asynchronous generator function then exits gracefully, is already
12261226
closed, or raises :exc:`GeneratorExit` (by not catching the exception),
12271227
then the returned awaitable will raise a :exc:`StopIteration` exception.
1228-
Any further awaitables returned by subsequent calls to the asynchronous
1229-
generator will raise a :exc:`StopAsyncIteration` exception.
1228+
Awaitables returned by subsequent calls to :meth:`~agen.__anext__`
1229+
or :meth:`~agen.asend` will raise a :exc:`StopAsyncIteration` exception.
12301230

12311231
If the asynchronous generator yields a value, a :exc:`RuntimeError` is
12321232
raised by the awaitable.
@@ -2313,19 +2313,19 @@ expression support in the :mod:`re` module).
23132313

23142314
Perform a string formatting operation. The string on which this method is
23152315
called can contain literal text or replacement fields delimited by braces
2316-
``{}``. Each replacement field contains either the numeric index of a
2317-
positional argument, or the name of a keyword argument. Returns a copy of
2316+
``{}``. Each replacement field refers to a positional argument (numbered
2317+
explicitly or automatically) or a keyword argument. Returns a copy of
23182318
the string where each replacement field is replaced with the string value of
23192319
the corresponding argument. For example:
23202320

23212321
.. doctest::
23222322

2323-
>>> "The sum of 1 + 2 is {0}".format(1+2)
2324-
'The sum of 1 + 2 is 3'
2325-
>>> "The sum of {a} + {b} is {answer}".format(answer=1+2, a=1, b=2)
2323+
>>> "The sum of {} + {} is {}".format(1, 2, 1+2)
23262324
'The sum of 1 + 2 is 3'
23272325
>>> "{1} expects the {0} Inquisition!".format("Spanish", "Nobody")
23282326
'Nobody expects the Spanish Inquisition!'
2327+
>>> "The sum of {a} + {b} is {answer}".format(answer=1+2, a=1, b=2)
2328+
'The sum of 1 + 2 is 3'
23292329

23302330
See :ref:`formatstrings` for a description of the various formatting options
23312331
that can be specified in format strings.
@@ -3180,7 +3180,7 @@ expression support in the :mod:`re` module).
31803180

31813181
Return a copy of the string with all the cased characters [4]_ converted to
31823182
uppercase. Note that ``s.upper().isupper()`` might be ``False`` if ``s``
3183-
contains uncased characters or if the Unicode category of the resulting
3183+
contains no cased characters or if the Unicode category of the resulting
31843184
character(s) is not "Lu" (Letter, uppercase), but e.g. "Lt" (Letter,
31853185
titlecase).
31863186

@@ -3537,9 +3537,8 @@ The conversion types are:
35373537
| | character in the result. | |
35383538
+------------+-----------------------------------------------------+-------+
35393539

3540-
For floating-point formats, the result should be correctly rounded to a given
3541-
precision ``p`` of digits after the decimal point. The rounding mode matches
3542-
that of the :func:`round` builtin.
3540+
For floating-point formats, the result should be correctly rounded to the
3541+
specified precision. The rounding mode matches that of the :func:`round` builtin.
35433542

35443543
Notes:
35453544

@@ -5928,8 +5927,9 @@ can be used interchangeably to index the same dictionary entry.
59285927

59295928

59305929
.. seealso::
5931-
:class:`frozendict` and :class:`types.MappingProxyType` can be used to
5932-
create a read-only view of a :class:`dict`.
5930+
:class:`types.MappingProxyType` can be used to create a read-only view
5931+
of a :class:`dict`. :class:`frozendict` is an immutable version of
5932+
:class:`dict`.
59335933

59345934
.. seealso::
59355935

@@ -6082,8 +6082,7 @@ Frozen dictionaries
60826082

60836083
Similar to :meth:`dict.fromkeys`, but call again the type constructor
60846084
with an initialized :class:`frozendict` if the type is a
6085-
:class:`frozendict` subclass or if the constructor returned a
6086-
:class:`frozendict`.
6085+
:class:`frozendict` subclass.
60876086

60886087
.. versionadded:: 3.15
60896088

@@ -6532,8 +6531,8 @@ The user-exposed type for the union object can be accessed from
65326531

65336532
.. note::
65346533
The :meth:`!__or__` method for type objects was added to support the syntax
6535-
``X | Y``. If a metaclass implements :meth:`!__or__`, the Union may
6536-
override it:
6534+
``X | Y``. If a metaclass implements :meth:`!__or__`, it may override
6535+
the default behavior of creating a union:
65376536

65386537
.. doctest::
65396538

‎Doc/c-api/code.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bound into a function.
5050
free variables of a code object. The names are in the same order as the
5151
values returned by :c:func:`PyUnstable_InterpreterFrame_GetLocal`.
5252
53-
.. versionadded:: next
53+
.. versionadded:: 3.16
5454
5555
.. c:function:: PyCodeObject* PyUnstable_Code_New(int argcount, int kwonlyargcount, int nlocals, int stacksize, int flags, PyObject *code, PyObject *consts, PyObject *names, PyObject *varnames, PyObject *freevars, PyObject *cellvars, PyObject *filename, PyObject *name, PyObject *qualname, int firstlineno, PyObject *linetable, PyObject *exceptiontable)
5656

‎Doc/c-api/conversion.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,4 @@ macros above:
277277
Values used internally by the ``Py_IS*`` classification macros above.
278278
Exposed for backwards compatibility only.
279279
280-
.. soft-deprecated:: next
280+
.. soft-deprecated:: 3.16

‎Doc/c-api/dict.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ Dictionary objects
527527
528528
Works with O(1) complexity.
529529
530-
.. versionadded:: next
530+
.. versionadded:: 3.16
531531
532532
533533
.. c:function:: int PyDict_AddWatcher(PyDict_WatchCallback callback)

‎Doc/c-api/exceptions.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,19 +1350,19 @@ to :c:data:`PyExc_OSError`.
13501350
13511351
.. c:var:: PyObject *PyExc_EnvironmentError
13521352
1353-
.. soft-deprecated:: next
1353+
.. soft-deprecated:: 3.16
13541354
Use :c:data:`PyExc_OSError` instead.
13551355
13561356
.. c:var:: PyObject *PyExc_IOError
13571357
1358-
.. soft-deprecated:: next
1358+
.. soft-deprecated:: 3.16
13591359
Use :c:data:`PyExc_OSError` instead.
13601360
13611361
.. c:var:: PyObject *PyExc_WindowsError
13621362
13631363
.. availability:: Windows
13641364
1365-
.. soft-deprecated:: next
1365+
.. soft-deprecated:: 3.16
13661366
Use :c:data:`PyExc_OSError` instead.
13671367
13681368

‎Doc/c-api/file.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,4 @@ by mistake. They are documented solely for completeness; use other
188188
The string literal ``"b"``, used to open files in binary mode.
189189
Exposed for backwards compatibility only.
190190
191-
.. soft-deprecated:: next
191+
.. soft-deprecated:: 3.16

‎Doc/c-api/frame.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,4 @@ Unless using :pep:`523`, you will not need this.
258258
* If the slot is unset or hidden, store ``NULL`` in *result* and return ``0``.
259259
* On error, raise an exception, store ``NULL`` in *result* and return ``-1``.
260260
261-
.. versionadded:: next
261+
.. versionadded:: 3.16

0 commit comments

Comments
 (0)