Skip to content

Commit 743dcc9

Browse files
authored
Merge branch 'main' into ssl-docs
2 parents 097bdd6 + 4a9b981 commit 743dcc9

2,671 files changed

Lines changed: 188149 additions & 100466 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.

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 37 additions & 21 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
@@ -171,9 +171,6 @@ 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)
178175
Platforms/emscripten @freakboy3742 @emmatyping
179176
Tools/wasm/emscripten @freakboy3742 @emmatyping
@@ -226,7 +223,7 @@ Tools/cases_generator/ @markshannon
226223
Python/assemble.c @markshannon @iritkatriel
227224
Python/codegen.c @markshannon @iritkatriel
228225
Python/compile.c @markshannon @iritkatriel
229-
Python/flowgraph.c @markshannon @iritkatriel
226+
Python/flowgraph.c @markshannon @iritkatriel @eclips4
230227
Python/instruction_sequence.c @iritkatriel
231228
Python/symtable.c @JelleZijlstra @carljm
232229

@@ -286,25 +283,26 @@ Programs/_bootstrap_python.c @ericsnowcurrently @FFY00
286283
Programs/python.c @ericsnowcurrently @FFY00
287284

288285
# JIT
289-
.github/workflows/jit.yml @savannahostrowski
290-
Include/internal/pycore_jit.h @brandtbucher @savannahostrowski @diegorusso
291-
Python/jit.c @brandtbucher @savannahostrowski @diegorusso
292-
Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
293-
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
286+
Include/internal/pycore_jit.h @brandtbucher @diegorusso
287+
Python/jit.c @brandtbucher @diegorusso
288+
Tools/jit/ @brandtbucher @diegorusso
289+
InternalDocs/jit.md @brandtbucher @diegorusso @AA-Turner
294290

295291
# Lazy imports (PEP 810)
296-
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
297-
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
298-
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
292+
.github/workflows/reusable-test-lazy-imports-all.yml @yhg1s @DinoV @pablogsal
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
299296

300297
# Micro-op / μop / Tier 2 Optimiser
301298
Python/optimizer.c @markshannon @Fidget-Spinner
302-
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
303-
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
304-
Python/optimizer_symbols.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
299+
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner
300+
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner
301+
Python/optimizer_symbols.c @markshannon @tomasr8 @Fidget-Spinner
305302

306303
# Parser, Lexer, and Grammar
307304
Grammar/python.gram @pablogsal @lysnikolaou
305+
Grammar/invalid.gram @pablogsal @lysnikolaou
308306
Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
309307
Lib/test/test_tokenize.py @pablogsal @lysnikolaou
310308
Lib/tokenize.py @pablogsal @lysnikolaou
@@ -335,7 +333,6 @@ Modules/_remote_debugging/ @pablogsal
335333

336334
# Sub-Interpreters
337335
**/*crossinterp* @ericsnowcurrently
338-
**/*interpreteridobject.* @ericsnowcurrently
339336
Doc/library/concurrent.interpreters.rst @ericsnowcurrently
340337
Lib/concurrent/futures/interpreter.py @ericsnowcurrently
341338
Lib/concurrent/interpreters/ @ericsnowcurrently
@@ -435,6 +432,7 @@ Lib/test/test_*time.py @pganssle @StanFromIreland
435432
Modules/*zoneinfo* @pganssle @StanFromIreland
436433
Modules/*time* @pganssle @StanFromIreland
437434
Python/pytime.c @pganssle @StanFromIreland
435+
Python/_strptime.c @pganssle @StanFromIreland
438436

439437
# Dbm
440438
Doc/library/dbm.rst @corona10 @erlend-aasland @serhiy-storchaka
@@ -602,6 +600,12 @@ Doc/library/tomllib.rst @encukou @hauntsaninja
602600
Lib/test/test_tomllib/ @encukou @hauntsaninja
603601
Lib/tomllib/ @encukou @hauntsaninja
604602

603+
# Turtle
604+
Doc/library/turtle.rst @StanFromIreland
605+
Doc/library/turtle-star.png @StanFromIreland
606+
Lib/test/test_turtle.py @StanFromIreland
607+
Lib/turtle.py @StanFromIreland
608+
605609
# Typing
606610
Doc/library/typing.rst @JelleZijlstra @AlexWaygood
607611
Lib/test/test_typing.py @JelleZijlstra @AlexWaygood
@@ -624,6 +628,12 @@ Lib/test/test_unittest/testmock/ @cjw296
624628
# Weakref
625629
**/*weakref* @kumaraditya303
626630

631+
# Zlib
632+
Doc/library/zlib.rst @StanFromIreland
633+
Lib/compression/zlib.py @StanFromIreland
634+
Lib/test/test_zlib.py @StanFromIreland
635+
Modules/zlibmodule.c @StanFromIreland
636+
627637
# Zipfile.Path
628638
Lib/test/test_zipfile/_path/ @jaraco
629639
Lib/zipfile/_path/ @jaraco
@@ -646,3 +656,9 @@ Modules/**/clinic/
646656
Objects/**/clinic/
647657
PC/**/clinic/
648658
Python/**/clinic/
659+
660+
# Exclude Lazy Imports=all CI carve out file
661+
Lib/test/lazy_imports_all_exclude.txt
662+
663+
# Exclude HTML IDs list
664+
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

0 commit comments

Comments
 (0)