Skip to content

Commit e94a203

Browse files
Merge branch 'main' of https://github.com/python/cpython into gh-144446-frame-locals
2 parents a4cae67 + 392d6d1 commit e94a203

2,908 files changed

Lines changed: 170863 additions & 98315 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.

‎.claude/CLAUDE.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 35 additions & 19 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 @JacobCoffee
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 @JacobCoffee
73-
.ruff.toml @hugovk @AlexWaygood @AA-Turner @JacobCoffee
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
@@ -172,8 +172,12 @@ Lib/_osx_support.py @python/macos-team
172172
Lib/test/test__osx_support.py @python/macos-team
173173

174174
# WebAssembly (Emscripten)
175-
Platforms/emscripten @freakboy3742 @emmatyping
176-
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
177181

178182
# WebAssembly (WASI)
179183
Platforms/WASI @brettcannon @emmatyping @savannahostrowski
@@ -283,25 +287,26 @@ Programs/_bootstrap_python.c @ericsnowcurrently @FFY00
283287
Programs/python.c @ericsnowcurrently @FFY00
284288

285289
# JIT
286-
.github/workflows/jit.yml @savannahostrowski
287-
Include/internal/pycore_jit.h @brandtbucher @savannahostrowski @diegorusso
288-
Python/jit.c @brandtbucher @savannahostrowski @diegorusso
289-
Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
290-
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
291294

292295
# 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
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
296300

297301
# Micro-op / μop / Tier 2 Optimiser
298302
Python/optimizer.c @markshannon @Fidget-Spinner
299-
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
300-
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
301-
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
302306

303307
# Parser, Lexer, and Grammar
304308
Grammar/python.gram @pablogsal @lysnikolaou
309+
Grammar/invalid.gram @pablogsal @lysnikolaou
305310
Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
306311
Lib/test/test_tokenize.py @pablogsal @lysnikolaou
307312
Lib/tokenize.py @pablogsal @lysnikolaou
@@ -431,6 +436,7 @@ Lib/test/test_*time.py @pganssle @StanFromIreland
431436
Modules/*zoneinfo* @pganssle @StanFromIreland
432437
Modules/*time* @pganssle @StanFromIreland
433438
Python/pytime.c @pganssle @StanFromIreland
439+
Python/_strptime.c @pganssle @StanFromIreland
434440

435441
# Dbm
436442
Doc/library/dbm.rst @corona10 @erlend-aasland @serhiy-storchaka
@@ -508,6 +514,13 @@ Doc/library/importlib.resources.rst @jaraco @warsaw @FFY00
508514
Lib/importlib/resources/ @jaraco @warsaw @FFY00
509515
Lib/test/test_importlib/resources/ @jaraco @warsaw @FFY00
510516

517+
# IO
518+
Doc/library/io.rst @cmaloney
519+
Lib/_pyio.py @cmaloney
520+
Lib/io.py @cmaloney
521+
Lib/test/test_io/ @cmaloney
522+
Modules/_io/ @cmaloney
523+
511524
# Itertools
512525
Doc/library/itertools.rst @rhettinger
513526
Lib/test/test_itertools.py @rhettinger
@@ -630,7 +643,7 @@ Lib/test/test_unittest/testmock/ @cjw296
630643
Doc/library/zlib.rst @StanFromIreland
631644
Lib/compression/zlib.py @StanFromIreland
632645
Lib/test/test_zlib.py @StanFromIreland
633-
Modules/_zlibmodule.c @StanFromIreland
646+
Modules/zlibmodule.c @StanFromIreland
634647

635648
# Zipfile.Path
636649
Lib/test/test_zipfile/_path/ @jaraco
@@ -655,5 +668,8 @@ Objects/**/clinic/
655668
PC/**/clinic/
656669
Python/**/clinic/
657670

671+
# Exclude Lazy Imports=all CI carve out file
672+
Lib/test/lazy_imports_all_exclude.txt
673+
658674
# Exclude HTML IDs list
659675
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/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/dependabot.yml‎

Lines changed: 132 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ updates:
77
labels:
88
- "skip issue"
99
- "skip news"
10-
ignore:
11-
- dependency-name: "*"
12-
update-types:
13-
- "version-update:semver-minor"
14-
- "version-update:semver-patch"
1510
groups:
1611
actions:
1712
patterns:
@@ -21,12 +16,141 @@ updates:
2116
# Cooldowns protect against supply chain attacks by avoiding the
2217
# highest-risk window immediately after new releases.
2318
default-days: 14
19+
2420
- package-ecosystem: "pip"
2521
directory: "/Tools/"
2622
schedule:
2723
interval: "quarterly"
28-
labels:
29-
- "skip issue"
30-
- "skip news"
24+
labels: ["skip issue", "skip news"]
25+
groups:
26+
pip:
27+
patterns: ["*"]
28+
cooldown:
29+
default-days: 14
30+
31+
- package-ecosystem: "npm"
32+
directory: "/Platforms/emscripten/browser_test/"
33+
schedule:
34+
interval: "quarterly"
35+
labels: ["OS-emscripten", "skip issue", "skip news"]
36+
groups:
37+
npm:
38+
patterns: ["*"]
39+
cooldown:
40+
default-days: 14
41+
42+
# Release branches: Dependabot only reads this file from the default
43+
# branch, so each branch that should get its own actions bumps needs an
44+
# entry here with `target-branch`. Add one when a new release branch is
45+
# created, and remove when the branch reaches end-of-life.
46+
- package-ecosystem: "github-actions"
47+
target-branch: "3.15"
48+
directory: "/"
49+
schedule:
50+
interval: "quarterly"
51+
labels: ["skip issue", "skip news"]
52+
groups:
53+
actions:
54+
patterns: ["*"]
55+
cooldown:
56+
default-days: 14
57+
58+
- package-ecosystem: "github-actions"
59+
target-branch: "3.14"
60+
directory: "/"
61+
schedule:
62+
interval: "quarterly"
63+
labels: ["skip issue", "skip news"]
64+
groups:
65+
actions:
66+
patterns: ["*"]
67+
cooldown:
68+
default-days: 14
69+
70+
- package-ecosystem: "github-actions"
71+
target-branch: "3.13"
72+
directory: "/"
73+
schedule:
74+
interval: "quarterly"
75+
labels: ["skip issue", "skip news"]
76+
groups:
77+
actions:
78+
patterns: ["*"]
79+
cooldown:
80+
default-days: 14
81+
82+
- package-ecosystem: "github-actions"
83+
target-branch: "3.12"
84+
directory: "/"
85+
schedule:
86+
interval: "quarterly"
87+
labels: ["skip issue", "skip news"]
88+
groups:
89+
actions:
90+
patterns: ["*"]
91+
cooldown:
92+
default-days: 14
93+
94+
- package-ecosystem: "github-actions"
95+
target-branch: "3.11"
96+
directory: "/"
97+
schedule:
98+
interval: "quarterly"
99+
labels: ["skip issue", "skip news"]
100+
groups:
101+
actions:
102+
patterns: ["*"]
103+
cooldown:
104+
default-days: 14
105+
106+
# Only bump bugfix branches for pip. Remove
107+
# the entry when branch goes security-only.
108+
- package-ecosystem: "pip"
109+
target-branch: "3.15"
110+
directory: "/Tools/"
111+
schedule:
112+
interval: "quarterly"
113+
labels: ["skip issue", "skip news"]
114+
groups:
115+
pip:
116+
patterns: ["*"]
117+
cooldown:
118+
default-days: 14
119+
120+
- package-ecosystem: "pip"
121+
target-branch: "3.14"
122+
directory: "/Tools/"
123+
schedule:
124+
interval: "quarterly"
125+
labels: ["skip issue", "skip news"]
126+
groups:
127+
pip:
128+
patterns: ["*"]
129+
cooldown:
130+
default-days: 14
131+
132+
# Only bump bugfix branches for npm. Remove
133+
# the entry when branch goes security-only.
134+
- package-ecosystem: "npm"
135+
target-branch: "3.15"
136+
directory: "/Platforms/emscripten/browser_test/"
137+
schedule:
138+
interval: "quarterly"
139+
labels: ["OS-emscripten", "skip issue", "skip news"]
140+
groups:
141+
npm:
142+
patterns: ["*"]
143+
cooldown:
144+
default-days: 14
145+
146+
- package-ecosystem: "npm"
147+
target-branch: "3.14"
148+
directory: "/Platforms/emscripten/browser_test/"
149+
schedule:
150+
interval: "quarterly"
151+
labels: ["OS-emscripten", "skip issue", "skip news"]
152+
groups:
153+
npm:
154+
patterns: ["*"]
31155
cooldown:
32156
default-days: 14

0 commit comments

Comments
 (0)