Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb569865

Browse files
authored
Merge branch 'main' into fix-issue-129069
2 parentsadf2c15 +5f50541 commitb569865

File tree

301 files changed

+8156
-3822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+8156
-3822
lines changed

‎.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Modules/Setup* @erlend-aasland
3030
Objects/set*@rhettinger
3131
Objects/dict*@methane@markshannon
3232
Objects/typevarobject.c@JelleZijlstra
33+
Objects/unionobject.c@JelleZijlstra
3334
Objects/type*@markshannon
3435
Objects/codeobject.c@markshannon
3536
Objects/frameobject.c@markshannon
@@ -167,6 +168,9 @@ Include/internal/pycore_time.h @pganssle @abalkin
167168
**/*imap*@python/email-team
168169
**/*poplib*@python/email-team
169170

171+
# Exclude .mailmap from being owned by @python/email-team
172+
/.mailmap
173+
170174
# Garbage collector
171175
/Modules/gcmodule.c@pablogsal
172176
/Doc/library/gc.rst@pablogsal

‎.github/actionlint.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
self-hosted-runner:
2-
labels:["windows-aarch64"]
2+
# Pending https://github.com/rhysd/actionlint/issues/533
3+
labels:["windows-11-arm"]
34

45
config-variables:null
56

‎.github/workflows/build.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -156,28 +156,18 @@ jobs:
156156
strategy:
157157
fail-fast:false
158158
matrix:
159-
os:
160-
-windows-latest
161159
arch:
162160
-x64
161+
-Win32
162+
-arm64
163163
free-threading:
164164
-false
165165
-true
166-
include:
167-
# Forks don't have access to Windows on Arm runners. These jobs are skipped below:
168-
-os:${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
169-
arch:arm64
170-
free-threading:false
171-
# Forks don't have access to Windows on Arm runners. These jobs are skipped below:
172-
-os:${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
173-
arch:arm64
174-
free-threading:true
175-
-os:windows-latest
176-
arch:Win32
177-
free-threading:false
166+
exclude:
167+
# Skip Win32 on free-threaded builds
168+
-{ arch: Win32, free-threading: true }
178169
uses:./.github/workflows/reusable-windows.yml
179170
with:
180-
os:${{ matrix.os }}
181171
arch:${{ matrix.arch }}
182172
free-threading:${{ matrix.free-threading }}
183173

@@ -189,18 +179,12 @@ jobs:
189179
strategy:
190180
fail-fast:false
191181
matrix:
192-
os:
193-
-windows-latest
194182
arch:
195183
-x86
196184
-x64
197-
include:
198-
# Forks don't have access to Windows on Arm runners. These jobs are skipped below:
199-
-os:${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
200-
arch:arm64
185+
-arm64
201186
uses:./.github/workflows/reusable-windows-msi.yml
202187
with:
203-
os:${{ matrix.os }}
204188
arch:${{ matrix.arch }}
205189

206190
build-macos:

‎.github/workflows/jit.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ jobs:
7474
runner:windows-latest
7575
-target:aarch64-pc-windows-msvc/msvc
7676
architecture:ARM64
77-
# Forks don't have access to Windows on Arm runners. These jobs are skipped below:
78-
runner:${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
77+
runner:windows-11-arm
7978
-target:x86_64-apple-darwin/clang
8079
architecture:x86_64
8180
runner:macos-13
@@ -97,8 +96,7 @@ jobs:
9796
python-version:'3.11'
9897

9998
-name:Windows
100-
# Forks don't have access to Windows on Arm runners. Skip those:
101-
if:runner.os == 'Windows' && (matrix.architecture != 'ARM64' || github.repository_owner == 'python')
99+
if:runner.os == 'Windows'
102100
run:|
103101
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
104102
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}

‎.github/workflows/reusable-windows-msi.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: Reusable Windows MSI
33
on:
44
workflow_call:
55
inputs:
6-
os:
7-
description:OS to run on
8-
required:true
9-
type:string
106
arch:
117
description:CPU architecture
128
required:true
@@ -21,7 +17,7 @@ env:
2117
jobs:
2218
build:
2319
name:installer for ${{ inputs.arch }}
24-
runs-on:${{ inputs.os }}
20+
runs-on:${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
2521
timeout-minutes:60
2622
env:
2723
ARCH:${{ inputs.arch }}
@@ -31,7 +27,5 @@ jobs:
3127
with:
3228
persist-credentials:false
3329
-name:Build CPython installer
34-
# Forks don't have access to Windows on Arm runners. Skip those:
35-
if:inputs.arch != 'arm64' || github.repository_owner == 'python'
3630
run:./Tools/msi/build.bat --doc -"${ARCH}"
3731
shell:bash

‎.github/workflows/reusable-windows.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: Reusable Windows
33
on:
44
workflow_call:
55
inputs:
6-
os:
7-
description:OS to run on
8-
required:true
9-
type:string
106
arch:
117
description:CPU architecture
128
required:true
@@ -25,7 +21,7 @@ env:
2521
jobs:
2622
build:
2723
name:Build and test (${{ inputs.arch }})
28-
runs-on:${{ inputs.os }}
24+
runs-on:${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
2925
timeout-minutes:60
3026
env:
3127
ARCH:${{ inputs.arch }}
@@ -37,21 +33,15 @@ jobs:
3733
if:inputs.arch != 'Win32'
3834
run:echo "::add-matcher::.github/problem-matchers/msvc.json"
3935
-name:Build CPython
40-
# Forks don't have access to Windows on Arm runners. Skip those:
41-
if:inputs.arch != 'arm64' || github.repository_owner == 'python'
4236
run:>-
4337
.\\PCbuild\\build.bat
4438
-e -d -v
4539
-p "${ARCH}"
4640
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
4741
shell:bash
4842
-name:Display build info
49-
# Forks don't have access to Windows on Arm runners. Skip those:
50-
if:inputs.arch != 'arm64' || github.repository_owner == 'python'
5143
run:.\\python.bat -m test.pythoninfo
5244
-name:Tests
53-
# Forks don't have access to Windows on Arm runners. Skip those:
54-
if:inputs.arch != 'arm64' || github.repository_owner == 'python'
5545
run:>-
5646
.\\PCbuild\\rt.bat
5747
-p "${ARCH}"

‎.github/zizmor.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ rules:
44
dangerous-triggers:
55
ignore:
66
-documentation-links.yml
7+
unpinned-uses:
8+
config:
9+
policies:
10+
"*":ref-pin

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# This file sets the canonical name for contributors to the repository.
22
# Documentation: https://git-scm.com/docs/gitmailmap
3+
Willow Chargin <wchargin@gmail.com>
34
Amethyst Reese <amethyst@n7.gg> <john@noswap.com>

‎.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
-repo:https://github.com/astral-sh/ruff-pre-commit
3-
rev:v0.9.1
3+
rev:v0.11.6
44
hooks:
55
-id:ruff
66
name:Run Ruff (lint) on Doc/
@@ -11,9 +11,9 @@ repos:
1111
args:[--exit-non-zero-on-fix]
1212
files:^Lib/test/
1313
-id:ruff
14-
name:Run Ruff (lint) on Tools/build/check_warnings.py
14+
name:Run Ruff (lint) on Tools/build/
1515
args:[--exit-non-zero-on-fix, --config=Tools/build/.ruff.toml]
16-
files:^Tools/build/check_warnings.py
16+
files:^Tools/build/
1717
-id:ruff
1818
name:Run Ruff (lint) on Argument Clinic
1919
args:[--exit-non-zero-on-fix, --config=Tools/clinic/.ruff.toml]
@@ -24,7 +24,7 @@ repos:
2424
files:^Doc/
2525

2626
-repo:https://github.com/psf/black-pre-commit-mirror
27-
rev:24.10.0
27+
rev:25.1.0
2828
hooks:
2929
-id:black
3030
name:Run Black on Tools/build/check_warnings.py
@@ -49,7 +49,7 @@ repos:
4949
types_or:[c, inc, python, rst]
5050

5151
-repo:https://github.com/python-jsonschema/check-jsonschema
52-
rev:0.31.0
52+
rev:0.33.0
5353
hooks:
5454
-id:check-dependabot
5555
-id:check-github-workflows
@@ -61,7 +61,7 @@ repos:
6161
-id:actionlint
6262

6363
-repo:https://github.com/woodruffw/zizmor-pre-commit
64-
rev:v1.1.1
64+
rev:v1.6.0
6565
hooks:
6666
-id:zizmor
6767

‎Doc/c-api/complex.rst

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -44,36 +44,12 @@ pointers. This is consistent throughout the API.
4444
representation.
4545
4646
47-
.. c:function:: Py_complex _Py_cr_sum(Py_complex left, double right)
48-
49-
Return the sum of a complex number and a real number, using the C :c:type:`Py_complex`
50-
representation.
51-
52-
.. versionadded:: 3.14
53-
54-
5547
.. c:function:: Py_complex _Py_c_diff(Py_complex left, Py_complex right)
5648
5749
Return the difference between two complex numbers, using the C
5850
:c:type:`Py_complex` representation.
5951
6052
61-
.. c:function:: Py_complex _Py_cr_diff(Py_complex left, double right)
62-
63-
Return the difference between a complex number and a real number, using the C
64-
:c:type:`Py_complex` representation.
65-
66-
.. versionadded:: 3.14
67-
68-
69-
.. c:function:: Py_complex _Py_rc_diff(double left, Py_complex right)
70-
71-
Return the difference between a real number and a complex number, using the C
72-
:c:type:`Py_complex` representation.
73-
74-
.. versionadded:: 3.14
75-
76-
7753
.. c:function:: Py_complex _Py_c_neg(Py_complex num)
7854
7955
Return the negation of the complex number *num*, using the C
@@ -86,14 +62,6 @@ pointers. This is consistent throughout the API.
8662
representation.
8763
8864
89-
.. c:function:: Py_complex _Py_cr_prod(Py_complex left, double right)
90-
91-
Return the product of a complex number and a real number, using the C
92-
:c:type:`Py_complex` representation.
93-
94-
.. versionadded:: 3.14
95-
96-
9765
.. c:function:: Py_complex _Py_c_quot(Py_complex dividend, Py_complex divisor)
9866
9967
Return the quotient of two complex numbers, using the C :c:type:`Py_complex`
@@ -103,28 +71,6 @@ pointers. This is consistent throughout the API.
10371
:c:data:`errno` to :c:macro:`!EDOM`.
10472
10573
106-
.. c:function:: Py_complex _Py_cr_quot(Py_complex dividend, double divisor)
107-
108-
Return the quotient of a complex number and a real number, using the C
109-
:c:type:`Py_complex` representation.
110-
111-
If *divisor* is zero, this method returns zero and sets
112-
:c:data:`errno` to :c:macro:`!EDOM`.
113-
114-
.. versionadded:: 3.14
115-
116-
117-
.. c:function:: Py_complex _Py_rc_quot(double dividend, Py_complex divisor)
118-
119-
Return the quotient of a real number and a complex number, using the C
120-
:c:type:`Py_complex` representation.
121-
122-
If *divisor* is zero, this method returns zero and sets
123-
:c:data:`errno` to :c:macro:`!EDOM`.
124-
125-
.. versionadded:: 3.14
126-
127-
12874
.. c:function:: Py_complex _Py_c_pow(Py_complex num, Py_complex exp)
12975
13076
Return the exponentiation of *num* by *exp*, using the C :c:type:`Py_complex`

‎Doc/c-api/unicode.rst

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,14 @@ APIs:
596596
Objects other than Unicode or its subtypes will cause a :exc:`TypeError`.
597597
598598
599+
.. c:function:: PyObject* PyUnicode_FromOrdinal(int ordinal)
600+
601+
Create a Unicode Object from the given Unicode code point *ordinal*.
602+
603+
The ordinal must be in ``range(0x110000)``. A :exc:`ValueError` is
604+
raised in the case it is not.
605+
606+
599607
.. c:function:: PyObject* PyUnicode_FromEncodedObject(PyObject *obj, \
600608
const char *encoding, const char *errors)
601609
@@ -666,6 +674,21 @@ APIs:
666674
..versionadded::3.3
667675
668676
677+
..c:function::intPyUnicode_Resize(PyObject **unicode, Py_ssize_t length);
678+
679+
Resize a Unicode object *\*unicode* to the new *length* in code points.
680+
681+
Try to resize the string in place (which is usually faster than allocating
682+
a new string and copying characters), or create a new string.
683+
684+
*\*unicode* is modified to point to the new (resized) object and ``0`` is
685+
returned on success. Otherwise, ``-1`` is returned and an exception is set,
686+
and *\*unicode* is left untouched.
687+
688+
The function doesn't check string content, the result may not be a
689+
string in canonical representation.
690+
691+
669692
.. c:function:: Py_ssize_t PyUnicode_Fill(PyObject *unicode, Py_ssize_t start, \
670693
Py_ssize_t length, Py_UCS4 fill_char)
671694
@@ -1003,6 +1026,17 @@ generic ones are documented for simplicity.
10031026
Generic Codecs
10041027
""""""""""""""
10051028
1029+
The following macro is provided:
1030+
1031+
1032+
.. c:macro:: Py_UNICODE_REPLACEMENT_CHARACTER
1033+
1034+
The Unicode code point ``U+FFFD`` (replacement character).
1035+
1036+
This Unicode character is used as the replacement character during
1037+
decoding if the *errors* argument is set to "replace".
1038+
1039+
10061040
These are the generic codec APIs:
10071041
10081042

‎Doc/data/refcounts.dat

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2770,6 +2770,9 @@ PyUnicode_FromFormatV:PyObject*::+1:
27702770
PyUnicode_FromFormatV:const char*:format::
27712771
PyUnicode_FromFormatV:va_list:args::
27722772

2773+
PyUnicode_FromOrdinal:PyObject*::+1:
2774+
PyUnicode_FromOrdinal:int:ordinal::
2775+
27732776
PyUnicode_Append:void:::
27742777
PyUnicode_Append:PyObject**:p_left:0:
27752778
PyUnicode_Append:PyObject*:right::
@@ -2791,6 +2794,10 @@ PyUnicode_CopyCharacters:PyObject*:from:0:
27912794
PyUnicode_CopyCharacters:Py_ssize_t:from_start::
27922795
PyUnicode_CopyCharacters:Py_ssize_t:how_many::
27932796

2797+
PyUnicode_Resize:int:::
2798+
PyUnicode_Resize:PyObject**:unicode:0:
2799+
PyUnicode_Resize:Py_ssize_t:length::
2800+
27942801
PyUnicode_Fill:Py_ssize_t:::
27952802
PyUnicode_Fill:PyObject*:unicode:0:
27962803
PyUnicode_Fill:Py_ssize_t:start::

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp