Skip to content

Commit 938f19b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into pr-150838
# Conflicts: # Doc/library/io.rst
2 parents 3cb0a65 + 78a70f8 commit 938f19b

2,665 files changed

Lines changed: 282234 additions & 139627 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.

‎.azure-pipelines/windows-layout-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
displayName: Show layout info (${{ parameters.kind }})
1313

1414
- ${{ if eq(parameters.fulltest, 'true') }}:
15-
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)" -i test_launcher
15+
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
1616
workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
1717
displayName: ${{ parameters.kind }} Tests
1818
env:

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
root = true
22

3-
[*.{py,c,cpp,h,js,rst,md,yml,yaml,gram}]
3+
[*.{py,c,cpp,h,js,rst,md,yml,yaml,toml,gram}]
44
trim_trailing_whitespace = true
55
insert_final_newline = true
66
indent_style = space
77

8-
[*.{py,c,cpp,h,gram}]
8+
[*.{py,c,cpp,h,toml,gram}]
99
indent_size = 4
1010

1111
[*.rst]

‎.gitattributes‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*.zip binary
2020

2121
# Specific binary files
22-
PC/classicAppCompat.* binary
22+
# -- None right now --
2323

2424
# Text files that should not be subject to eol conversion
2525
[attr]noeol -text
@@ -80,12 +80,12 @@ Include/internal/pycore_ast_state.h generated
8080
Include/internal/pycore_opcode.h generated
8181
Include/internal/pycore_opcode_metadata.h generated
8282
Include/internal/pycore_*_generated.h generated
83+
Include/internal/pycore_token.h generated
8384
Include/internal/pycore_uop_ids.h generated
8485
Include/internal/pycore_uop_metadata.h generated
8586
Include/opcode.h generated
8687
Include/opcode_ids.h generated
8788
Include/slots_generated.h generated
88-
Include/token.h generated
8989
Lib/_opcode_metadata.py generated
9090
Lib/idlelib/help.html generated
9191
Lib/keyword.py generated
@@ -102,6 +102,7 @@ Modules/_testinternalcapi/test_cases.c.h generated
102102
Modules/_testinternalcapi/test_targets.h generated
103103
PC/python3dll.c generated
104104
Parser/parser.c generated
105+
Parser/parser_invalid.c generated
105106
Parser/token.c generated
106107
Programs/test_frozenmain.h generated
107108
Python/Python-ast.c generated

‎.github/CODEOWNERS‎

Lines changed: 62 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
.azure-pipelines/ @AA-Turner
6464

6565
# GitHub & related scripts
66-
.github/ @ezio-melotti @hugovk @AA-Turner @webknjaz @itamaro
67-
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz
68-
Lib/test/test_tools/test_compute_changes.py @AA-Turner @hugovk @webknjaz
66+
.github/ @ezio-melotti @hugovk @AA-Turner @webknjaz @itamaro @JacobCoffee @StanFromIreland
67+
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz @StanFromIreland
68+
Lib/test/test_tools/test_compute_changes.py @AA-Turner @hugovk @webknjaz @StanFromIreland
6969
Tools/build/verify_ensurepip_wheels.py @AA-Turner @pfmoore @pradyunsg
7070

7171
# Pre-commit
72-
.pre-commit-config.yaml @hugovk
73-
.ruff.toml @hugovk @AlexWaygood @AA-Turner
72+
.pre-commit-config.yaml @hugovk @JacobCoffee @StanFromIreland
73+
.ruff.toml @hugovk @AlexWaygood @AA-Turner @JacobCoffee @StanFromIreland
7474

7575
# Patchcheck
7676
Tools/patchcheck/ @AA-Turner @itamaro
@@ -171,12 +171,13 @@ Mac/ @python/macos-team
171171
Lib/_osx_support.py @python/macos-team
172172
Lib/test/test__osx_support.py @python/macos-team
173173

174-
# WebAssembly
175-
Tools/wasm/README.md @brettcannon @freakboy3742 @emmatyping
176-
177174
# WebAssembly (Emscripten)
178-
Platforms/emscripten @freakboy3742 @emmatyping
179-
Tools/wasm/emscripten @freakboy3742 @emmatyping
175+
Platforms/emscripten @freakboy3742 @emmatyping @hoodmane
176+
Tools/wasm/emscripten @freakboy3742 @emmatyping @hoodmane
177+
Python/wasm_trampoline.c @hoodmane
178+
Python/emscripten_signal.c @hoodmane
179+
Python/emscripten_syscalls.c @hoodmane
180+
.github/workflows/reusable-emscripten.yml @hoodmane
180181

181182
# WebAssembly (WASI)
182183
Platforms/WASI @brettcannon @emmatyping @savannahostrowski
@@ -188,12 +189,8 @@ Tools/wasm/wasi @brettcannon @emmatyping @savannahostrowski
188189
PC/ @python/windows-team
189190
PCbuild/ @python/windows-team
190191

191-
# Windows installer packages
192-
Tools/msi/ @python/windows-team
193-
Tools/nuget/ @python/windows-team
194-
195-
# Windows Launcher
196-
PC/launcher.c @python/windows-team @vsajip
192+
# Windows Venv launcher/redirector
193+
PC/venvlauncher.c @python/windows-team @vsajip
197194

198195

199196
# ----------------------------------------------------------------------------
@@ -230,7 +227,7 @@ Tools/cases_generator/ @markshannon
230227
Python/assemble.c @markshannon @iritkatriel
231228
Python/codegen.c @markshannon @iritkatriel
232229
Python/compile.c @markshannon @iritkatriel
233-
Python/flowgraph.c @markshannon @iritkatriel
230+
Python/flowgraph.c @markshannon @iritkatriel @eclips4
234231
Python/instruction_sequence.c @iritkatriel
235232
Python/symtable.c @JelleZijlstra @carljm
236233

@@ -290,25 +287,26 @@ Programs/_bootstrap_python.c @ericsnowcurrently @FFY00
290287
Programs/python.c @ericsnowcurrently @FFY00
291288

292289
# JIT
293-
.github/workflows/jit.yml @savannahostrowski
294-
Include/internal/pycore_jit.h @brandtbucher @savannahostrowski @diegorusso
295-
Python/jit.c @brandtbucher @savannahostrowski @diegorusso
296-
Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
297-
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
290+
Include/internal/pycore_jit.h @brandtbucher @diegorusso
291+
Python/jit.c @brandtbucher @diegorusso
292+
Tools/jit/ @brandtbucher @diegorusso
293+
InternalDocs/jit.md @brandtbucher @diegorusso @AA-Turner
298294

299295
# Lazy imports (PEP 810)
300-
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
301-
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
302-
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
296+
.github/workflows/reusable-test-lazy-imports-all.yml @yhg1s @DinoV @pablogsal
297+
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
298+
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
299+
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
303300

304301
# Micro-op / μop / Tier 2 Optimiser
305302
Python/optimizer.c @markshannon @Fidget-Spinner
306-
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
307-
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
308-
Python/optimizer_symbols.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
303+
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner
304+
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner
305+
Python/optimizer_symbols.c @markshannon @tomasr8 @Fidget-Spinner
309306

310307
# Parser, Lexer, and Grammar
311308
Grammar/python.gram @pablogsal @lysnikolaou
309+
Grammar/invalid.gram @pablogsal @lysnikolaou
312310
Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
313311
Lib/test/test_tokenize.py @pablogsal @lysnikolaou
314312
Lib/tokenize.py @pablogsal @lysnikolaou
@@ -339,7 +337,6 @@ Modules/_remote_debugging/ @pablogsal
339337

340338
# Sub-Interpreters
341339
**/*crossinterp* @ericsnowcurrently
342-
**/*interpreteridobject.* @ericsnowcurrently
343340
Doc/library/concurrent.interpreters.rst @ericsnowcurrently
344341
Lib/concurrent/futures/interpreter.py @ericsnowcurrently
345342
Lib/concurrent/interpreters/ @ericsnowcurrently
@@ -439,6 +436,7 @@ Lib/test/test_*time.py @pganssle @StanFromIreland
439436
Modules/*zoneinfo* @pganssle @StanFromIreland
440437
Modules/*time* @pganssle @StanFromIreland
441438
Python/pytime.c @pganssle @StanFromIreland
439+
Python/_strptime.c @pganssle @StanFromIreland
442440

443441
# Dbm
444442
Doc/library/dbm.rst @corona10 @erlend-aasland @serhiy-storchaka
@@ -500,6 +498,11 @@ Lib/_markupbase.py @ezio-melotti
500498
Lib/test/test_html*.py @ezio-melotti
501499
Tools/build/parse_html5_entities.py @ezio-melotti
502500

501+
# HTTP
502+
Doc/library/http* @orsenthil
503+
Lib/http/ @orsenthil
504+
Lib/test/test_http*.py @orsenthil
505+
503506
# IDLE
504507
Doc/library/idle.rst @terryjreedy
505508
Lib/idlelib/ @terryjreedy
@@ -516,6 +519,13 @@ Doc/library/importlib.resources.rst @jaraco @warsaw @FFY00
516519
Lib/importlib/resources/ @jaraco @warsaw @FFY00
517520
Lib/test/test_importlib/resources/ @jaraco @warsaw @FFY00
518521

522+
# IO
523+
Doc/library/io.rst @cmaloney
524+
Lib/_pyio.py @cmaloney
525+
Lib/io.py @cmaloney
526+
Lib/test/test_io/ @cmaloney
527+
Modules/_io/ @cmaloney
528+
519529
# Itertools
520530
Doc/library/itertools.rst @rhettinger
521531
Lib/test/test_itertools.py @rhettinger
@@ -606,6 +616,12 @@ Doc/library/tomllib.rst @encukou @hauntsaninja
606616
Lib/test/test_tomllib/ @encukou @hauntsaninja
607617
Lib/tomllib/ @encukou @hauntsaninja
608618

619+
# Turtle
620+
Doc/library/turtle.rst @StanFromIreland
621+
Doc/library/turtle-star.png @StanFromIreland
622+
Lib/test/test_turtle.py @StanFromIreland
623+
Lib/turtle.py @StanFromIreland
624+
609625
# Typing
610626
Doc/library/typing.rst @JelleZijlstra @AlexWaygood
611627
Lib/test/test_typing.py @JelleZijlstra @AlexWaygood
@@ -622,12 +638,23 @@ Modules/_typesmodule.c @AA-Turner
622638
Lib/unittest/mock.py @cjw296
623639
Lib/test/test_unittest/testmock/ @cjw296
624640

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

628649
# Weakref
629650
**/*weakref* @kumaraditya303
630651

652+
# Zlib
653+
Doc/library/zlib.rst @StanFromIreland
654+
Lib/compression/zlib.py @StanFromIreland
655+
Lib/test/test_zlib.py @StanFromIreland
656+
Modules/zlibmodule.c @StanFromIreland
657+
631658
# Zipfile.Path
632659
Lib/test/test_zipfile/_path/ @jaraco
633660
Lib/zipfile/_path/ @jaraco
@@ -650,3 +677,9 @@ Modules/**/clinic/
650677
Objects/**/clinic/
651678
PC/**/clinic/
652679
Python/**/clinic/
680+
681+
# Exclude Lazy Imports=all CI carve out file
682+
Lib/test/lazy_imports_all_exclude.txt
683+
684+
# Exclude HTML IDs list
685+
Doc/tools/removed-ids.txt

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body:
1616
Make sure to also search the [CPython issue tracker](https://github.com/python/cpython/issues?q=is%3Aissue+sort%3Acreated-desc) to check that the bug has not already been reported.
1717
- type: textarea
1818
attributes:
19-
label: "Bug description:"
19+
label: "Bug report"
2020
description: >
2121
Give a clear and concise description of what happened.
2222
Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
@@ -34,7 +34,6 @@ body:
3434
label: "CPython versions tested on:"
3535
multiple: true
3636
options:
37-
- "3.10"
3837
- "3.11"
3938
- "3.12"
4039
- "3.13"

‎.github/ISSUE_TEMPLATE/crash.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ body:
1010
The CPython interpreter is written in a different programming language, C. A "CPython crash" is when Python itself fails, leading to a traceback in the C stack.
1111
- type: textarea
1212
attributes:
13-
label: What happened?
13+
label: Crash report
1414
description: >
15+
Give a clear and concise description of what happened.
1516
Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
1617
[Copy and paste code where possible rather than using screenshots](https://meta.stackoverflow.com/a/285557/13990016),
1718
and put any code blocks inside triple backticks.
@@ -27,7 +28,6 @@ body:
2728
label: "CPython versions tested on:"
2829
multiple: true
2930
options:
30-
- "3.10"
3131
- "3.11"
3232
- "3.12"
3333
- "3.13"

‎.github/ISSUE_TEMPLATE/feature.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
Major feature proposals should generally be discussed on [Discourse](https://discuss.python.org/c/ideas/6) before opening a GitHub issue. Wait until it's clear that most people support your idea before filling in this form.
1313
- type: textarea
1414
attributes:
15-
label: "Proposal:"
15+
label: "Feature or enhancement"
1616
description: >
1717
Explain your proposal, why it should be implemented, and how it would be used.
1818
Add examples, if applicable.

‎.github/SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Security Policy
22

33
Python [provides a security policy and threat model](https://devguide.python.org/security/policy/)
4-
in the Python Development Guide documenting what bugs are vulnerabilities,
4+
in the Python Developer's Guide documenting what bugs are vulnerabilities,
55
how to structure reports, and what versions of Python accept reports.
66

77
Python Security Response Team (PSRT) members

‎.github/VULNERABILITY_REPORT.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Vulnerability report
2+
description: Privately report a potential security vulnerability in CPython
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
**Not all bugs are vulnerabilities.** Before submitting, read the [Python security policy](https://devguide.python.org/security/policy/) to understand which issues are vulnerabilities and what versions of Python accept reports.
8+
9+
Keep the report short and in plain text: no headers, tables, PDFs, binaries, or severity and CVSS information.
10+
11+
Reports that do not contain a potential security vulnerability will be discarded without a reply.
12+
13+
To report vulnerabilities that affect other projects (such as pip or python.org), or if you are not sure where to send your report, email [security@python.org](mailto:security@python.org).
14+
- type: textarea
15+
id: summary
16+
attributes:
17+
label: Summary
18+
description: A few sentences describing the vulnerability.
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: threat_model
23+
attributes:
24+
label: Threat model
25+
description: >
26+
What does the attacker control, and what do they gain? Describe the code, configuration, or deployment that may exist in the real world and is exploitable. Where possible, cite the relevant part of the [security policy](https://devguide.python.org/security/policy/#what-types-of-bugs-are-vulnerabilities).
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: proof_of_concept
31+
attributes:
32+
label: Proof of concept
33+
description: >
34+
A script that reproduces the issue and clearly indicates whether the vulnerability is present, such as exiting with `1` if vulnerable and `0` if not. If it depends on a specially constructed binary file, include a script to construct the file rather than the file itself.
35+
36+
Wrap scripts longer than a few lines in a [collapsed section](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections) using `<details> ... </details>`.
37+
validations:
38+
required: true
39+
- type: dropdown
40+
id: versions
41+
attributes:
42+
label: "CPython versions tested on:"
43+
description: >
44+
If any tested version was not vulnerable, say which in the summary. Only [supported versions](https://devguide.python.org/versions/) accept reports.
45+
multiple: true
46+
options:
47+
- "3.11"
48+
- "3.12"
49+
- "3.13"
50+
- "3.14"
51+
- "3.15"
52+
- "3.16"
53+
- "CPython main branch"
54+
- type: textarea
55+
id: patch
56+
attributes:
57+
label: Suggested fix
58+
description: Ideally, a minimal patch with the mitigation.
59+
validations:
60+
required: false
61+
- type: checkboxes
62+
id: checklist
63+
attributes:
64+
label: Before submitting
65+
options:
66+
- label: I have read the security policy and evaluated this report against it.
67+
required: true
68+
- label: I have checked that this issue is not already resolved on the `main` branch.
69+
required: true
70+
- label: I have verified the factual validity of everything in this report, including any content produced by an LLM.
71+
required: true

‎.github/actionlint.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
config-variables: null
22

3+
# Pending release of actionlint > 1.7.12 for ubuntu-26.04* support:
4+
# https://github.com/rhysd/actionlint/pull/683
5+
self-hosted-runner:
6+
labels:
7+
- ubuntu-26.04
8+
- ubuntu-26.04-arm
9+
310
paths:
411
.github/workflows/**/*.yml:
512
ignore:
613
- 1st argument of function call is not assignable
714
- SC2(015|038|086|091|097|098|129|155)
15+
# Pending release of actionlint > 1.7.12 for `$/` self-repository syntax:
16+
# https://github.com/rhysd/actionlint/issues/711
17+
- reusable workflow call "\$/[^"]+" at "uses" is not following the format

0 commit comments

Comments
 (0)