Skip to content

Commit bdfb931

Browse files
skirpichevskirpichev
committed
Merge branch 'master' into fix-ctypes-Zf_set_sw
2 parents 309d8f3 + 6dad8b8 commit bdfb931

541 files changed

Lines changed: 41694 additions & 33084 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: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,10 @@ Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
290290
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
291291

292292
# Lazy imports (PEP 810)
293-
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
294-
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
295-
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
293+
.github/workflows/reusable-test-lazy-imports-all.yml @yhg1s @DinoV @pablogsal
294+
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
295+
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
296+
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
296297

297298
# Micro-op / μop / Tier 2 Optimiser
298299
Python/optimizer.c @markshannon @Fidget-Spinner
@@ -630,7 +631,7 @@ Lib/test/test_unittest/testmock/ @cjw296
630631
Doc/library/zlib.rst @StanFromIreland
631632
Lib/compression/zlib.py @StanFromIreland
632633
Lib/test/test_zlib.py @StanFromIreland
633-
Modules/_zlibmodule.c @StanFromIreland
634+
Modules/zlibmodule.c @StanFromIreland
634635

635636
# Zipfile.Path
636637
Lib/test/test_zipfile/_path/ @jaraco
@@ -655,5 +656,8 @@ Objects/**/clinic/
655656
PC/**/clinic/
656657
Python/**/clinic/
657658

659+
# Exclude Lazy Imports=all CI carve out file
660+
Lib/test/lazy_imports_all_exclude.txt
661+
658662
# Exclude HTML IDs list
659663
Doc/tools/removed-ids.txt

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,12 @@ jobs:
476476
name: hypothesis-example-db
477477
path: ${{ env.CPYTHON_BUILDDIR }}/.hypothesis/examples/
478478

479+
test-lazy-imports-all:
480+
name: 'Lazy imports enabled'
481+
needs: build-context
482+
if: fromJSON(needs.build-context.outputs.run-tests)
483+
uses: ./.github/workflows/reusable-test-lazy-imports-all.yml
484+
479485
build-asan:
480486
name: 'Address sanitizer'
481487
runs-on: ${{ matrix.os }}
@@ -648,6 +654,7 @@ jobs:
648654
- build-emscripten
649655
- build-wasi
650656
- test-hypothesis
657+
- test-lazy-imports-all
651658
- build-asan
652659
- build-san
653660
- cross-build-linux
@@ -705,4 +712,5 @@ jobs:
705712
${{ !fromJSON(needs.build-context.outputs.run-ios) && 'build-ios,' || '' }}
706713
${{ !fromJSON(needs.build-context.outputs.run-emscripten) && 'build-emscripten,' || '' }}
707714
${{ !fromJSON(needs.build-context.outputs.run-wasi) && 'build-wasi,' || '' }}
715+
${{ !fromJSON(needs.build-context.outputs.run-tests) && 'test-lazy-imports-all,' || '' }}
708716
jobs: ${{ toJSON(needs) }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ jobs:
8686
--fail-if-regression \
8787
--fail-if-improved \
8888
--fail-if-new-news-nit
89+
- name: 'Build list of changes'
90+
run: |
91+
make -C Doc/ PYTHON=../python changes
8992
- name: 'Collect HTML IDs'
9093
if: github.event_name == 'pull_request'
9194
run: python Doc/tools/check-html-ids.py collect Doc/build/html -o Doc/build/html-ids-head.json.gz

‎.github/workflows/reusable-test-lazy-imports-all.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Reusable Lazy Imports Tests
2+
3+
# Run the CPython test suite with global lazy imports forced on
4+
# (``-X lazy_imports=all``).
5+
#
6+
# Modules that are known to fail under lazy imports are listed in
7+
# Lib/test/lazy_imports_all_exclude.txt and skipped here. Remove entries from
8+
# that file as the modules are fixed so this workflow starts guarding them
9+
# against regressions. Excluded modules are also checked separately so the
10+
# workflow fails when one starts passing and its exclusion should be removed.
11+
12+
on:
13+
workflow_call:
14+
15+
permissions:
16+
contents: read
17+
18+
env:
19+
FORCE_COLOR: 1
20+
21+
jobs:
22+
test-lazy-imports-all:
23+
name: 'Run Tests with lazy_imports=all'
24+
runs-on: ubuntu-26.04
25+
timeout-minutes: 60
26+
env:
27+
EXCLUDE_FILE: Lib/test/lazy_imports_all_exclude.txt
28+
steps:
29+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
30+
with:
31+
persist-credentials: false
32+
- name: Register gcc problem matcher
33+
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
34+
- name: Install dependencies
35+
run: sudo ./.github/workflows/posix-deps-apt.sh
36+
- name: Configure CPython
37+
run: ./configure --config-cache --with-pydebug
38+
- name: Build CPython
39+
run: make -j4
40+
- name: Display build info
41+
run: make pythoninfo
42+
- name: Verify lazy imports are fully enabled
43+
run: ./python -X lazy_imports=all -c "import sys; assert sys.flags.lazy_imports == 1, sys.flags.lazy_imports; print('lazy imports all enabled')"
44+
- name: Build test list (all tests minus the known-failing exclusions)
45+
run: |
46+
set -euo pipefail
47+
./python -m test --list-tests > all_tests.txt
48+
# Strip comments/blank lines from the exclusion file, then drop those
49+
# exact test names (whole-line, fixed-string match) from the run list.
50+
grep -vE '^\s*(#.*)?$' "$EXCLUDE_FILE" > exclude_tests.txt || true
51+
grep -vxF -f exclude_tests.txt all_tests.txt > run_tests.txt
52+
# Fail loudly if any exclusion entry matched nothing: a stale or
53+
# mistyped name (or a change in `--list-tests` output) would otherwise
54+
# silently stop excluding a module and let it fail the run.
55+
stale=$(comm -23 <(sort -u exclude_tests.txt) <(sort -u all_tests.txt))
56+
if [ -n "$stale" ]; then
57+
echo "::error::Stale entries in $EXCLUDE_FILE (no longer match 'python -m test --list-tests'); remove or fix them:"
58+
echo "$stale"
59+
exit 1
60+
fi
61+
echo "Excluding $(wc -l < exclude_tests.txt) module(s); running $(wc -l < run_tests.txt) of $(wc -l < all_tests.txt)."
62+
- name: Run tests with lazy imports
63+
run: xvfb-run xargs -a run_tests.txt ./python -X lazy_imports=all -m test --fast-ci --timeout=900 < /dev/null
64+
- name: Verify excluded tests still need exclusion
65+
run: |
66+
set -euo pipefail
67+
unexpected_passes=()
68+
while IFS= read -r test_name; do
69+
[ -n "$test_name" ] || continue
70+
echo "Checking excluded test: $test_name"
71+
if xvfb-run ./python -X lazy_imports=all -m test --fast-ci --timeout=900 "$test_name"; then
72+
unexpected_passes+=("$test_name")
73+
fi
74+
done < exclude_tests.txt
75+
if [ "${#unexpected_passes[@]}" -ne 0 ]; then
76+
echo "::error::These tests still appear in $EXCLUDE_FILE but now pass with -X lazy_imports=all. Remove them from the exclude file:"
77+
printf '%s\n' "${unexpected_passes[@]}"
78+
exit 1
79+
fi

Doc/library/constants.rst renamed to Doc/builtins/constants.rst

File renamed without changes.

Doc/library/exceptions.rst renamed to Doc/builtins/exceptions.rst

File renamed without changes.

Doc/library/functions.rst renamed to Doc/builtins/functions.rst

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. XXX document all delegations to __special__ methods
22
.. _built-in-funcs:
33

4-
Built-in Functions
4+
Built-in functions
55
==================
66

77
The Python interpreter has a number of functions and types built into it that
@@ -129,7 +129,7 @@ are always available. They are listed here in alphabetical order.
129129
anext(async_iterator, default, /)
130130

131131
When awaited, return the next item from the given :term:`asynchronous
132-
iterator`, or *default* if given and the iterator is exhausted.
132+
iterator`, or *default* if given and the iterator is :term:`exhausted`.
133133

134134
This is the async variant of the :func:`next` builtin, and behaves
135135
similarly.
@@ -1223,7 +1223,7 @@ are always available. They are listed here in alphabetical order.
12231223
process_block(block)
12241224

12251225
*stop_exception* is useful for callables
1226-
which report exhaustion by raising an exception
1226+
which report :term:`exhaustion <exhausted>` by raising an exception
12271227
instead of returning a special value.
12281228
For example, draining a queue::
12291229

@@ -1315,7 +1315,7 @@ are always available. They are listed here in alphabetical order.
13151315
yielding the results. If additional *iterables* arguments are passed,
13161316
*function* must take that many arguments and is applied to the items from all
13171317
iterables in parallel. With multiple iterables, the iterator stops when the
1318-
shortest iterable is exhausted. If *strict* is ``True`` and one of the
1318+
shortest iterable is :term:`exhausted`. If *strict* is ``True`` and one of the
13191319
iterables is exhausted before the others, a :exc:`ValueError` is raised. For
13201320
cases where the function inputs are already arranged into argument tuples,
13211321
see :func:`itertools.starmap`.
@@ -1397,7 +1397,7 @@ are always available. They are listed here in alphabetical order.
13971397

13981398
Retrieve the next item from the :term:`iterator` by calling its
13991399
:meth:`~iterator.__next__` method. If *default* is given, it is returned
1400-
if the iterator is exhausted, otherwise :exc:`StopIteration` is raised.
1400+
if the iterator is :term:`exhausted`, otherwise :exc:`StopIteration` is raised.
14011401

14021402

14031403
.. class:: object()
@@ -1459,7 +1459,8 @@ are always available. They are listed here in alphabetical order.
14591459
already exists), ``'x'`` for exclusive creation, and ``'a'`` for appending
14601460
(which on *some* Unix systems, means that *all* writes append to the end of
14611461
the file regardless of the current seek position). In text mode, if
1462-
*encoding* is not specified the encoding used is platform-dependent:
1462+
*encoding* is not specified, UTF-8 is used by default; if
1463+
:ref:`Python UTF-8 Mode <utf8-mode>` is disabled,
14631464
:func:`locale.getencoding` is called to get the current locale encoding.
14641465
(For reading and writing raw bytes use binary mode and leave
14651466
*encoding* unspecified.) The available modes are:
@@ -1490,7 +1491,7 @@ are always available. They are listed here in alphabetical order.
14901491
argument) return contents as :class:`bytes` objects without any decoding. In
14911492
text mode (the default, or when ``'t'`` is included in the *mode* argument),
14921493
the contents of the file are returned as :class:`str`, the bytes having been
1493-
first decoded using a platform-dependent encoding or using the specified
1494+
first decoded using the default encoding or using the specified
14941495
*encoding* if given.
14951496

14961497
.. note::
@@ -1519,9 +1520,11 @@ are always available. They are listed here in alphabetical order.
15191520
described above for binary files.
15201521

15211522
*encoding* is the name of the encoding used to decode or encode the file.
1522-
This should only be used in text mode. The default encoding is platform
1523-
dependent (whatever :func:`locale.getencoding` returns), but any
1524-
:term:`text encoding` supported by Python can be used.
1523+
This should only be used in text mode. The default encoding is UTF-8;
1524+
if :ref:`Python UTF-8 Mode <utf8-mode>` is disabled, the default is
1525+
platform-dependent (whatever :func:`locale.getencoding` returns).
1526+
Any :term:`text encoding` supported by Python can be used, and
1527+
``encoding="locale"`` specifies the current locale encoding explicitly.
15251528
See the :mod:`codecs` module for the list of supported encodings.
15261529

15271530
*errors* is an optional string that specifies how encoding and decoding
@@ -1638,6 +1641,10 @@ are always available. They are listed here in alphabetical order.
16381641
.. versionchanged:: 3.11
16391642
The ``'U'`` mode has been removed.
16401643

1644+
.. versionchanged:: 3.15
1645+
UTF-8 is now the default encoding, instead of the
1646+
platform-dependent locale encoding (:pep:`686`).
1647+
16411648
.. function:: ord(character, /)
16421649

16431650
Return the ordinal value of a character.
@@ -2312,7 +2319,7 @@ are always available. They are listed here in alphabetical order.
23122319
the code that prepared these iterables. Python offers three different
23132320
approaches to dealing with this issue:
23142321

2315-
* By default, :func:`zip` stops when the shortest iterable is exhausted.
2322+
* By default, :func:`zip` stops when the shortest iterable is :term:`exhausted`.
23162323
It will ignore the remaining items in the longer iterables, cutting off
23172324
the result to the length of the shortest iterable::
23182325

@@ -2327,7 +2334,7 @@ are always available. They are listed here in alphabetical order.
23272334
[('a', 1), ('b', 2), ('c', 3)]
23282335

23292336
Unlike the default behavior, it raises a :exc:`ValueError` if one iterable
2330-
is exhausted before the others:
2337+
is :term:`exhausted` before the others:
23312338

23322339
>>> for item in zip(range(3), ['fee', 'fi', 'fo', 'fum'], strict=True): # doctest: +SKIP
23332340
... print(item)

‎Doc/builtins/index.rst‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
.. _builtins-index:
2+
3+
##############################
4+
Python built-ins reference
5+
##############################
6+
7+
Python comes with a number of built-in functions and classes.
8+
9+
The built-in classes include data types that would normally be considered part
10+
of the "core" of a language, such as numbers and lists. For these types, the
11+
Python language core defines the form of literals and places some constraints
12+
on their semantics, but does not fully define the semantics.
13+
14+
The built-ins also include functions and exceptions --- objects that can
15+
be used by all Python code without the need of an :keyword:`import` statement.
16+
Some of these are defined by the core language, but many are not essential for
17+
the core semantics and are only described here.
18+
19+
.. seealso::
20+
21+
In addition to the built-ins, Python provides an extensive importable
22+
standard library, see :ref:`library-index`.
23+
24+
.. We don't use :numbered: option for the TOC below as it enforces
25+
numbered sections for the entire builtin docs. If desired,
26+
:numbered: can be enabled on a per-page basis.
27+
.. toctree::
28+
:maxdepth: 2
29+
30+
stdtypes.rst
31+
constants.rst
32+
functions.rst
33+
exceptions.rst
34+
threadsafety.rst
35+
time-complexity.rst

Doc/library/stdtypes.rst renamed to Doc/builtins/stdtypes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,7 +2157,7 @@ expression support in the :mod:`re` module).
21572157

21582158
The casefolding algorithm is `described in section 3.13.3 'Default Case
21592159
Folding' of the Unicode Standard
2160-
<https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G53253>`__.
2160+
<https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G53253>`__.
21612161

21622162
.. versionadded:: 3.3
21632163

@@ -2398,7 +2398,7 @@ expression support in the :mod:`re` module).
23982398
property being one of "Lm", "Lt", "Lu", "Ll", or "Lo". Note that this is different
23992399
from the `Alphabetic property defined in section 4.10 'Letters, Alphabetic, and
24002400
Ideographic' of the Unicode Standard
2401-
<https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-4/#G91002>`__.
2401+
<https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-4/#G91002>`__.
24022402
For example:
24032403

24042404
.. doctest::
@@ -2664,7 +2664,7 @@ expression support in the :mod:`re` module).
26642664

26652665
The lowercasing algorithm used is `described in section 3.13.2 'Default Case
26662666
Conversion' of the Unicode Standard
2667-
<https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G34078>`__.
2667+
<https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G34078>`__.
26682668

26692669

26702670
.. method:: str.lstrip(chars=None, /)
@@ -3176,7 +3176,7 @@ expression support in the :mod:`re` module).
31763176

31773177
The uppercasing algorithm used is `described in section 3.13.2 'Default Case
31783178
Conversion' of the Unicode Standard
3179-
<https://www.unicode.org/versions/Unicode17.0.0/core-spec/chapter-3/#G34078>`__.
3179+
<https://www.unicode.org/versions/Unicode18.0.0/core-spec/chapter-3/#G34078>`__.
31803180

31813181

31823182
.. method:: str.zfill(width, /)

Doc/library/threadsafety.rst renamed to Doc/builtins/threadsafety.rst

File renamed without changes.

0 commit comments

Comments
 (0)