Merge branch '140052-pytuple-make-pair' of github.com:sergey-miryanov/cpython into 140052-pytuple-make-pair

Author: sergey-miryanov

Doc/library/zlib.rst

@@ -9,10 +9,8 @@
 
 For applications that require data compression, the functions in this module
 allow compression and decompression, using the zlib library. The zlib library
-has its own home page at https://www.zlib.net.   There are known
-incompatibilities between the Python module and versions of the zlib library
-earlier than 1.1.3; 1.1.3 has a `security vulnerability <https://zlib.net/zlib_faq.html#faq33>`_, so we recommend using
-1.1.4 or later.
+has its own home page at https://www.zlib.net.  zlib 1.2.2.1 is the minium
+supported version.
 
 zlib's functions have many options and often need to be used in a particular
 order.  This documentation doesn't attempt to cover all of the permutations;

Doc/using/configure.rst

@@ -26,28 +26,26 @@ To build optional modules:
 
 * `libbz2 <https://sourceware.org/bzip2/>`_ for the :mod:`bz2` module.
 
-* `libb2 <https://github.com/BLAKE2/libb2>`_ (:ref:`BLAKE2 <hashlib-blake2>`),
-  used by :mod:`hashlib` module.
+* `libb2 <https://github.com/BLAKE2/libb2>`_ (:ref:`BLAKE2 <hashlib-blake2>`)
+  for the :mod:`hashlib` module.
 
 * `libffi <https://sourceware.org/libffi/>`_ 3.3.0 is the recommended
   minimum version for the :mod:`ctypes` module.
 
-* ``liblzma``, for the :mod:`lzma` module.
+* ``liblzma`` for the :mod:`lzma` module.
 
 * `libmpdec <https://www.bytereef.org/mpdecimal/doc/libmpdec/>`_ 2.5.0
   for the :mod:`decimal` module.
 
-* ``libncurses`` or ``libncursesw``,
-  for the :mod:`curses` module.
+* ``libncurses`` or ``libncursesw`` for the :mod:`curses` module.
 
-* ``libpanel`` or ``libpanelw``,
-  for the :mod:`curses.panel` module.
+* ``libpanel`` or ``libpanelw`` for the :mod:`curses.panel` module.
 
 * `libreadline <https://tiswww.case.edu/php/chet/readline/rltop.html>`_ or
   `libedit <https://www.thrysoee.dk/editline/>`_
   for the :mod:`readline` module.
 
-* `libuuid <https://linux.die.net/man/3/libuuid>`_, for the :mod:`uuid` module.
+* `libuuid <https://linux.die.net/man/3/libuuid>`_ for the :mod:`uuid` module.
 
 * `OpenSSL <https://www.openssl.org/>`_ 1.1.1 is the minimum version and
   OpenSSL 3.0.18 is the recommended minimum version for the
@@ -57,7 +55,7 @@ To build optional modules:
 
 * `Tcl/Tk <https://www.tcl-lang.org/>`_ 8.5.12 for the :mod:`tkinter` module.
 
-* `zlib <https://www.zlib.net>`_ 1.1.4 is the reccomended minimum version for the
+* `zlib <https://www.zlib.net>`_ 1.2.2.1 is the minimum version for the
   :mod:`zlib` module.
 
 * `zstd <https://facebook.github.io/zstd/>`_ 1.4.5 is the minimum version for

Include/internal/pycore_interp_structs.h

@@ -769,6 +769,12 @@ struct _is {
      * and should be placed at the beginning. */
     struct _ceval_state ceval;
 
+    /* This structure is carefully allocated so that it's correctly aligned
+     * to avoid undefined behaviors during LOAD and STORE. The '_malloced'
+     * field stores the allocated pointer address that will later be freed.
+     */
+    void *_malloced;
+
     PyInterpreterState *next;
 
     int64_t id;

Lib/urllib/error.py

@@ -18,7 +18,7 @@
 
 class URLError(OSError):
     # URLError is a sub-type of OSError, but it doesn't share any of
-    # the implementation.  need to override __init__ and __str__.
+    # the implementation. It overrides __init__ and __str__.
     # It sets self.args for compatibility with other OSError
     # subclasses, but args doesn't have the typical format with errno in
     # slot 0 and strerror in slot 1.  This may be better than nothing.

Misc/NEWS.d/next/Core_and_Builtins/2025-10-14-17-07-37.gh-issue-140067.ID2gOm.rst

@@ -1469,14 +1469,14 @@ bytearray_removesuffix_impl(PyByteArrayObject *self, Py_buffer *suffix)
 /*[clinic input]
 bytearray.resize
     size: Py_ssize_t
-        New size to resize to..
+        New size to resize to.
     /
 Resize the internal buffer of bytearray to len.
 [clinic start generated code]*/
 
 static PyObject *
 bytearray_resize_impl(PyByteArrayObject *self, Py_ssize_t size)
-/*[clinic end generated code: output=f73524922990b2d9 input=75fd4d17c4aa47d3]*/
+/*[clinic end generated code: output=f73524922990b2d9 input=6c9a260ca7f72071]*/
 {
     Py_ssize_t start_size = PyByteArray_GET_SIZE(self);
     int result = PyByteArray_Resize((PyObject *)self, size);

Objects/bytearrayobject.c

@@ -81,7 +81,7 @@ class object "PyObject *" "&PyBaseObject_Type"
 
 #define END_TYPE_DICT_LOCK() Py_END_CRITICAL_SECTION2()
 
-#ifdef Py_DEBUG
+#ifndef NDEBUG
 // Return true if the world is currently stopped.
 static bool
 types_world_is_stopped(void)

Objects/clinic/bytearrayobject.c.h

@@ -457,19 +457,16 @@ _PyInterpreterState_Enable(_PyRuntimeState *runtime)
 static PyInterpreterState *
 alloc_interpreter(void)
 {
-    // Aligned allocation for PyInterpreterState.
-    // the first word of the memory block is used to store
-    // the original pointer to be used later to free the memory.
     size_t alignment = _Alignof(PyInterpreterState);
-    size_t allocsize = sizeof(PyInterpreterState) + sizeof(void *) + alignment - 1;
+    size_t allocsize = sizeof(PyInterpreterState) + alignment - 1;
     void *mem = PyMem_RawCalloc(1, allocsize);
     if (mem == NULL) {
         return NULL;
     }
-    void *ptr = _Py_ALIGN_UP((char *)mem + sizeof(void *), alignment);
-    ((void **)ptr)[-1] = mem;
-    assert(_Py_IS_ALIGNED(ptr, alignment));
-    return ptr;
+    PyInterpreterState *interp = _Py_ALIGN_UP(mem, alignment);
+    assert(_Py_IS_ALIGNED(interp, alignment));
+    interp->_malloced = mem;
+    return interp;
 }
 
 static void
@@ -484,7 +481,7 @@ free_interpreter(PyInterpreterState *interp)
             interp->obmalloc = NULL;
         }
         assert(_Py_IS_ALIGNED(interp, _Alignof(PyInterpreterState)));
-        PyMem_RawFree(((void **)interp)[-1]);
+        PyMem_RawFree(interp->_malloced);
     }
 }