Merge branch 'main' into fix-gh-153854-imaplib-time2internaldate

Author: fedonman

Doc/library/asyncio-task.rst

@@ -377,7 +377,7 @@ and reliable way to wait for all tasks in the group to finish.
 
       * call it from the task group body based on some condition or event
       * pass the task group instance to child tasks via :meth:`create_task`, allowing a child
-        task to conditionally cancel the entire entire group
+        task to conditionally cancel the entire group
       * pass the task group instance or bound :meth:`cancel` method to some other task *before*
         opening the task group, allowing remote cancellation
 

Mac/BuildScript/resources/License.rtf

@@ -16,7 +16,7 @@ Python was created in the early 1990s by Guido van Rossum at Stichting Mathemati
 \
 In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see https://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software.\
 \
-In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations (now Zope Corporation, see https://www.zope.dev). In 2001, the Python Software Foundation (PSF, see https://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation is a sponsoring member of the PSF.\
+In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations, which became Zope Corporation. In 2001, the Python Software Foundation (PSF, see https://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation was a sponsoring member of the PSF.\
 \
 All Python releases are Open Source (see https://opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases.\
 \
@@ -29,7 +29,7 @@ All Python releases are Open Source (see https://opensource.org for the Open Sou
 1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes\
 1.6             1.5.2       2000        CNRI        no\
 2.0             1.6         2000        BeOpen.com  no\
-1.6.1           1.6         2001        CNRI        no\
+1.6.1           1.6         2001        CNRI        yes\
 2.1             2.0+1.6.1   2001        PSF         no\
 2.0.1           2.0+1.6.1   2001        PSF         yes\
 2.1.1           2.1+2.0.1   2001        PSF         yes\
@@ -39,8 +39,11 @@ All Python releases are Open Source (see https://opensource.org for the Open Sou
 
 \f1 \
 
-\f0\b Note:  
-\f1\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
+\f0\b Notes:
+\f1\b0 \
+(1) GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
+\
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, because its license has a choice of law clause.  According to CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 is "not incompatible" with the GPL.\
 \
 Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible.\
 \

Mac/BuildScript/resources/ReadMe.rtf

@@ -1,32 +1,26 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2761
+{\rtf1\ansi\ansicpg1252\cocoartf2870
 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
 \f3\fmodern\fcharset0 CourierNewPSMT;\f4\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
-\margl1440\margr1440\vieww13380\viewh14580\viewkind0
+\margl1440\margr1440\vieww15140\viewh15740\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
-
-\f1\b \cf0 NOTE: 
-\f0\b0 This is a beta preview of Python 3.13.0, the next feature release of Python 3.  It is not intended for production use.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-\cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\
 
 \f0\b0 \ulnone \
-This package includes its own private copy of OpenSSL 3.5.   The trust certificates in system and user keychains managed by the 
+This package includes its own private copy of OpenSSL 3.   The trust certificates in system and user keychains managed by the 
 \f2\i Keychain Access 
 \f0\i0 application and the 
 \f2\i security
 \f0\i0  command line utility are not used as defaults by the Python 
 \f3 ssl
 \f0  module.  A sample command script is included in 
-\f3 /Applications/Python 3.13
+\f3 /Applications/Python 3.15
 \f0  to install a curated bundle of default root certificates from the third-party 
 \f3 certifi
 \f0  package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}).  Double-click on 
@@ -42,18 +36,34 @@ The bundled
 
 \f0\b0 \ulnone \
 You can control some aspects of what is installed by this package. To see the options, click on the 
-\f4 Customize
-\f0  button in the 
-\f4 Installation Type
-\f0  step of the macOS installer app.  Click on a package name in the list shown to see more information about that option,\
-  \
+\f1\b Customize
+\f0\b0  button in the 
+\f1\b Installation Type
+\f0\b0  step of the macOS installer app.  Click on a package name in the list shown to see more information about that option.\
+\
+
+\f1\b \ul Free-threading support\
+
+\f0\b0 \ulnone \
+This installer package can optionally install an additional build of Python 3.15 that supports the free-threading feature (running with the 
+\f1\b global interpreter lock
+\f0\b0  disabled).\
+\
+See {\field{\*\fldinst{HYPERLINK "https://docs.python.org/3.15/using/mac.html"}}{\fldrslt the macOS section of the Python Setup and Usage document}}, the release notice, and the {\field{\*\fldinst{HYPERLINK "https://docs.python.org/3.15/whatsnew/3.15.html"}}{\fldrslt 3.15 What's New document}} for more information. As of Python 3.15, free-threading support is installed by default.\
+\
+
+\f1\b \ul Just-in-time compiler support\
+
+\f0\b0 \ulnone \
+As of Python 3.14, this installer package includes support for the experimental just-in-time (JIT) compiler feature. See the {\field{\*\fldinst{HYPERLINK "https://docs.python.org/dev/whatsnew/3.14.html#binary-releases-for-the-experimental-just-in-time-compiler"}}{\fldrslt 3.14 What's New document}} and the release notice for more information. Note that the just-in-time compiler is not available with the optional free-threading build.\
+ \
 
 \f1\b \ul Using IDLE or other Tk applications 
 \f0\b0 \ulnone \
 \
-This package includes its own private version of Tcl/Tk 8.6. It does not use any system-supplied or third-party supplied versions of Tcl/Tk.\
+This package includes its own private version of Tcl/Tk 9. It does not use any system-supplied or third-party supplied versions of Tcl/Tk.\
 \
-Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS may open a window with a message 
+Due to security checks introduced with macOS 10.15 Catalina, when launching IDLE, macOS may open a window with a message 
 \f1\b "Python" would like to access files in your Documents folder
 \f0\b0 .  This is normal as IDLE uses your 
 \f1\b Documents
@@ -69,7 +79,7 @@ Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS ma
 \f1\b \ul Apple Silicon Mac support\
 
 \f0\b0 \ulnone \
-On Apple Silicon Macs, it is possible to run Python either with native ARM64 code or under Intel 64 emulation using Rosetta2. This option might be useful for testing or if binary wheels are not yet available with native ARM64 binaries.  To easily force Python to run in emulation mode, invoke it from a command line shell with the 
+On Apple Silicon Macs, it is possible to run Python either with native ARM64 code or under Intel 64 emulation using Rosetta 2. This option might be useful for testing or if binary wheels are not yet available with native ARM64 binaries.  To easily force Python to run in emulation mode, invoke it from a command line shell with the 
 \f4 python3-intel64
 \f0  command instead of just 
 \f4 python3
@@ -84,4 +94,5 @@ For other changes in this release, see the
 \f0\i0  section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its 
 \f2\i Release Notes
 \f0\i0  link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
-}
+}
+

Mac/BuildScript/resources/Welcome.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2761
+{\rtf1\ansi\ansicpg1252\cocoartf2870
 \cocoascreenfonts1\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
 }
 {\colortbl;\red255\green255\blue255;}
@@ -23,8 +23,4 @@
 At the end of this install, click on 
 \f2 Install Certificates
 \f0  to install a set of current SSL root certificates.\
-\
-
-\f1\b NOTE: 
-\f0\b0 This is a beta test preview of Python 3.13.0, the next feature release of Python 3.  It is not intended for production use.\
 }

Misc/NEWS.d/next/Library/2026-06-03-19-35-32.gh-issue-150583.dedI24.rst

@@ -0,0 +1,2 @@
+Correctly set the default compression level in :mod:`compression.zstd` when passing a digested
+dictionary during compression.

Modules/_zstd/compressor.c

@@ -347,6 +347,7 @@ _zstd_ZstdCompressor_new_impl(PyTypeObject *type, PyObject *level,
     }
 
     self->use_multithread = 0;
+    self->compression_level = ZSTD_CLEVEL_DEFAULT;
     self->dict = NULL;
     self->lock = (PyMutex){0};