Skip to content

Commit 2d72953

Browse files
shihai1991shihai1991
committed
Merge remote-tracking branch 'origin/master' into bpo_41073_add_typeslots1
* origin/master: (80 commits) bpo-42282: Fold constants inside named expressions (pythonGH-23190) bpo-41028: Doc: Move switchers to docsbuild-scripts. (pythonGH-20969) bpo-42133: update parts of the stdlib to fall back to `__spec__.loader` when `__loader__` is missing (python#22929) Remove outdated reference to pywin32 from platform module (pythonGH-22005) bpo-41832: PyType_FromModuleAndSpec() now accepts NULL tp_doc (pythonGH-23123) Minor grammar edits for the descriptor howto guide (GH-python#23175) bpo-42179: Doc/tutorial: Remove mention of __cause__ (pythonGH-23162) bpo-26389: Allow passing an exception object in the traceback module (pythonGH-22610) bpo-42260: PyConfig_Read() only parses argv once (pythonGH-23168) bpo-42260: Add _PyConfig_FromDict() (pythonGH-23167) bpo-41877 Check for asert, aseert, assrt in mocks (pythonGH-23165) [docs] fix wrongly named AsyncContextDecorator (pythonGH-23164) bpo-42262: Add Py_NewRef() and Py_XNewRef() (pythonGH-23152) bpo-42266: Handle monkey-patching descriptors in LOAD_ATTR cache (pythonGH-23157) bpo-40816 Add AsyncContextDecorator class (pythonGH-20516) bpo-42260: Add _PyInterpreterState_SetConfig() (pythonGH-23158) Disable peg generator tests when building with PGO (pythonGH-23141) bpo-1635741: _sqlite3 uses PyModule_AddObjectRef() (pythonGH-23148) bpo-1635741: Fix PyInit_pyexpat() error handling (pythonGH-22489) bpo-42260: Main init modify sys.flags in-place (pythonGH-23150) ...
2 parents 2d8b57f + 8805a4d commit 2d72953

File tree

261 files changed

+7836
-3218
lines changed

Some content is hidden

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

261 files changed

+7836
-3218
lines changed

‎.azure-pipelines/windows-release/stage-pack-msix.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,11 @@ jobs:
120120
artifactName: unsigned_msix
121121
downloadPath: $(Build.BinariesDirectory)
122122

123+
# MSIX must be signed and timestamped simultaneously
123124
- powershell: |
124125
$failed = $true
125126
foreach ($retry in 1..3) {
126-
signtool sign /a /n "$(SigningCertificate)" /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d "$(SigningDescription)" (gi *.msix)
127+
signtool sign /a /n "$(SigningCertificate)" /fd sha256 /tr http://timestamp.digicert.com/ /td sha256 /d "$(SigningDescription)" (gi *.msix)
127128
if ($?) {
128129
$failed = $false
129130
break

‎.azure-pipelines/windows-release/stage-pack-nuget.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
condition: and(succeeded(), eq(variables['DoNuget'], 'true'))
55

66
pool:
7-
vmImage: windows-2019
7+
name: 'Windows Release'
88

99
workspace:
1010
clean: all
@@ -36,6 +36,14 @@ jobs:
3636
nuget pack "$(Build.BinariesDirectory)\layout\python.nuspec" -OutputDirectory $(Build.ArtifactStagingDirectory) -NoPackageAnalysis -NonInteractive
3737
displayName: 'Create nuget package'
3838
39+
- powershell: |
40+
gci *.nupkg | %{
41+
nuget sign "$_" -CertificateSubjectName "$(SigningCertificate)" -Timestamper http://timestamp.digicert.com/ -Overwrite
42+
}
43+
displayName: 'Sign nuget package'
44+
workingDirectory: $(Build.ArtifactStagingDirectory)
45+
condition: and(succeeded(), variables['SigningCertificate'])
46+
3947
- task: PublishBuildArtifacts@1
4048
displayName: 'Publish Artifact: nuget'
4149
inputs:

‎.azure-pipelines/windows-release/stage-sign.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
$files = (gi ${{ parameters.Include }} -Exclude ${{ parameters.Exclude }})
5858
$failed = $true
5959
foreach ($retry in 1..10) {
60-
signtool timestamp /t http://timestamp.verisign.com/scripts/timestamp.dll $files
60+
signtool timestamp /tr http://timestamp.digicert.com/ /td sha256 $files
6161
if ($?) {
6262
$failed = $false
6363
break

‎.github/workflows/posix-deps-apt.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ apt-get update
33

44
apt-get -yq install \
55
build-essential \
6-
zlib1g-dev \
6+
gdb \
7+
lcov \
78
libbz2-dev \
9+
libffi-dev \
10+
libgdbm-dev \
811
liblzma-dev \
912
libncurses5-dev \
1013
libreadline6-dev \
1114
libsqlite3-dev \
1215
libssl-dev \
13-
libgdbm-dev \
14-
tk-dev \
1516
lzma \
1617
lzma-dev \
17-
liblzma-dev \
18-
libffi-dev \
18+
tk-dev \
1919
uuid-dev \
2020
xvfb \
21-
lcov
21+
zlib1g-dev

‎Doc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,12 @@ serve:
215215

216216
# for development releases: always build
217217
autobuild-dev:
218-
make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
218+
make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1'
219219
-make suspicious
220220

221221
# for quick rebuilds (HTML only)
222222
autobuild-dev-html:
223-
make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
223+
make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1'
224224

225225
# for stable releases: only build if not in pre-release stage (alpha, beta)
226226
# release candidate downloads are okay, since the stable tree can be in that stage

‎Doc/c-api/exceptions.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ For convenience, some of these functions will always return a
182182
.. c:function:: PyObject* PyErr_SetFromErrnoWithFilename(PyObject *type, const char *filename)
183183
184184
Similar to :c:func:`PyErr_SetFromErrnoWithFilenameObject`, but the filename
185-
is given as a C string. *filename* is decoded from the filesystem encoding
186-
(:func:`os.fsdecode`).
185+
is given as a C string. *filename* is decoded from the :term:`filesystem
186+
encoding and error handler`.
187187
188188
189189
.. c:function:: PyObject* PyErr_SetFromWindowsErr(int ierr)
@@ -266,7 +266,7 @@ For convenience, some of these functions will always return a
266266
.. c:function:: void PyErr_SyntaxLocationEx(const char *filename, int lineno, int col_offset)
267267
268268
Like :c:func:`PyErr_SyntaxLocationObject`, but *filename* is a byte string
269-
decoded from the filesystem encoding (:func:`os.fsdecode`).
269+
decoded from the :term:`filesystem encoding and error handler`.
270270
271271
.. versionadded:: 3.2
272272
@@ -343,7 +343,7 @@ an error value).
343343
344344
Similar to :c:func:`PyErr_WarnExplicitObject` except that *message* and
345345
*module* are UTF-8 encoded strings, and *filename* is decoded from the
346-
filesystem encoding (:func:`os.fsdecode`).
346+
:term:`filesystem encoding and error handler`.
347347
348348
349349
.. c:function:: int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...)

‎Doc/c-api/init.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,9 @@ to 1 and ``-bb`` sets :c:data:`Py_BytesWarningFlag` to 2.
151151

152152
.. c:var:: int Py_LegacyWindowsFSEncodingFlag
153153
154-
If the flag is non-zero, use the ``mbcs`` encoding instead of the UTF-8
155-
encoding for the filesystem encoding.
154+
If the flag is non-zero, use the ``mbcs`` encoding with ``replace`` error
155+
handler, instead of the UTF-8 encoding with ``surrogatepass`` error handler,
156+
for the :term:`filesystem encoding and error handler`.
156157

157158
Set to ``1`` if the :envvar:`PYTHONLEGACYWINDOWSFSENCODING` environment
158159
variable is set to a non-empty string.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy