Skip to content

Commit 5dfbe55

Browse files
authored
Merge branch 'main' into gh-103443-ftplib-data-shutdown
2 parents 704990c + 797087c commit 5dfbe55

2,443 files changed

Lines changed: 103051 additions & 41808 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: 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: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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,11 +287,10 @@ 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)
293296
.github/workflows/reusable-test-lazy-imports-all.yml @yhg1s @DinoV @pablogsal
@@ -297,12 +300,13 @@ Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
297300

298301
# Micro-op / μop / Tier 2 Optimiser
299302
Python/optimizer.c @markshannon @Fidget-Spinner
300-
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
301-
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
302-
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
303306

304307
# Parser, Lexer, and Grammar
305308
Grammar/python.gram @pablogsal @lysnikolaou
309+
Grammar/invalid.gram @pablogsal @lysnikolaou
306310
Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
307311
Lib/test/test_tokenize.py @pablogsal @lysnikolaou
308312
Lib/tokenize.py @pablogsal @lysnikolaou
@@ -432,6 +436,7 @@ Lib/test/test_*time.py @pganssle @StanFromIreland
432436
Modules/*zoneinfo* @pganssle @StanFromIreland
433437
Modules/*time* @pganssle @StanFromIreland
434438
Python/pytime.c @pganssle @StanFromIreland
439+
Python/_strptime.c @pganssle @StanFromIreland
435440

436441
# Dbm
437442
Doc/library/dbm.rst @corona10 @erlend-aasland @serhiy-storchaka
@@ -493,6 +498,11 @@ Lib/_markupbase.py @ezio-melotti
493498
Lib/test/test_html*.py @ezio-melotti
494499
Tools/build/parse_html5_entities.py @ezio-melotti
495500

501+
# HTTP
502+
Doc/library/http* @orsenthil
503+
Lib/http/ @orsenthil
504+
Lib/test/test_http*.py @orsenthil
505+
496506
# IDLE
497507
Doc/library/idle.rst @terryjreedy
498508
Lib/idlelib/ @terryjreedy
@@ -509,6 +519,13 @@ Doc/library/importlib.resources.rst @jaraco @warsaw @FFY00
509519
Lib/importlib/resources/ @jaraco @warsaw @FFY00
510520
Lib/test/test_importlib/resources/ @jaraco @warsaw @FFY00
511521

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+
512529
# Itertools
513530
Doc/library/itertools.rst @rhettinger
514531
Lib/test/test_itertools.py @rhettinger
@@ -621,6 +638,11 @@ Modules/_typesmodule.c @AA-Turner
621638
Lib/unittest/mock.py @cjw296
622639
Lib/test/test_unittest/testmock/ @cjw296
623640

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

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ body:
2828
label: "CPython versions tested on:"
2929
multiple: true
3030
options:
31-
- "3.10"
3231
- "3.11"
3332
- "3.12"
3433
- "3.13"

‎.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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ paths:
1212
ignore:
1313
- 1st argument of function call is not assignable
1414
- 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

‎.github/dependabot.yml‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,17 @@ updates:
2828
cooldown:
2929
default-days: 14
3030

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+
3142
# Release branches: Dependabot only reads this file from the default
3243
# branch, so each branch that should get its own actions bumps needs an
3344
# entry here with `target-branch`. Add one when a new release branch is
@@ -92,18 +103,6 @@ updates:
92103
cooldown:
93104
default-days: 14
94105

95-
- package-ecosystem: "github-actions"
96-
target-branch: "3.10"
97-
directory: "/"
98-
schedule:
99-
interval: "quarterly"
100-
labels: ["skip issue", "skip news"]
101-
groups:
102-
actions:
103-
patterns: ["*"]
104-
cooldown:
105-
default-days: 14
106-
107106
# Only bump bugfix branches for pip. Remove
108107
# the entry when branch goes security-only.
109108
- package-ecosystem: "pip"
@@ -130,14 +129,28 @@ updates:
130129
cooldown:
131130
default-days: 14
132131

133-
- package-ecosystem: "pip"
134-
target-branch: "3.13"
135-
directory: "/Tools/"
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/"
136137
schedule:
137138
interval: "quarterly"
138-
labels: ["skip issue", "skip news"]
139+
labels: ["OS-emscripten", "skip issue", "skip news"]
139140
groups:
140-
pip:
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:
141154
patterns: ["*"]
142155
cooldown:
143156
default-days: 14

0 commit comments

Comments
 (0)