Merge branch 'main' into hotfix/148263

Author: prakashsellathurai

.gitattributes

@@ -34,6 +34,9 @@ Lib/test/xmltestdata/*                     noeol
 Lib/venv/scripts/common/activate text eol=lf
 Lib/venv/scripts/posix/* text eol=lf
 
+# Prevent GitHub's web conflict editor from converting LF to CRLF
+*.rst text eol=lf
+
 # CRLF files
 [attr]dos text eol=crlf
 

.github/workflows/mypy.yml

@@ -19,6 +19,7 @@ on:
       - "Tools/build/consts_getter.py"
       - "Tools/build/deepfreeze.py"
       - "Tools/build/generate-build-details.py"
+      - "Tools/build/generate_levenshtein_examples.py"
       - "Tools/build/generate_sbom.py"
       - "Tools/build/generate_stdlib_module_names.py"
       - "Tools/build/mypy.ini"

.github/workflows/reusable-san.yml

@@ -40,17 +40,15 @@ jobs:
         # Install clang
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
+        sudo ./llvm.sh 20
+        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100
+        sudo update-alternatives --set clang /usr/bin/clang-20
+        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100
+        sudo update-alternatives --set clang++ /usr/bin/clang++-20
 
         if [ "${SANITIZER}" = "TSan" ]; then
-          sudo ./llvm.sh 17  # gh-121946: llvm-18 package is temporarily broken
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100
-          sudo update-alternatives --set clang /usr/bin/clang-17
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100
-          sudo update-alternatives --set clang++ /usr/bin/clang++-17
           # Reduce ASLR to avoid TSan crashing
           sudo sysctl -w vm.mmap_rnd_bits=28
-        else
-          sudo ./llvm.sh 20
         fi
 
     - name: Sanitizer option setup

Doc/deprecations/pending-removal-in-3.17.rst

@@ -35,7 +35,7 @@ Pending removal in Python 3.17
 
   - Passing non-ascii *encoding* names to :func:`encodings.normalize_encoding`
     is deprecated and scheduled for removal in Python 3.17.
-    (Contributed by Stan Ulbrych in :gh:`136702`)
+    (Contributed by Stan Ulbrych in :gh:`136702`.)
 
 * :mod:`typing`:
 

Doc/library/multiprocessing.rst

@@ -1336,12 +1336,12 @@ Connection objects are usually created using
       Note that multiple connection objects may be polled at once by
       using :func:`multiprocessing.connection.wait`.
 
-   .. method:: send_bytes(buffer[, offset[, size]])
+   .. method:: send_bytes(buf[, offset[, size]])
 
       Send byte data from a :term:`bytes-like object` as a complete message.
 
-      If *offset* is given then data is read from that position in *buffer*.  If
-      *size* is given then that many bytes will be read from buffer.  Very large
+      If *offset* is given then data is read from that position in *buf*.  If
+      *size* is given then that many bytes will be read from *buf*.  Very large
       buffers (approximately 32 MiB+, though it depends on the OS) may raise a
       :exc:`ValueError` exception
 
@@ -1361,18 +1361,18 @@ Connection objects are usually created using
          alias of :exc:`OSError`.
 
 
-   .. method:: recv_bytes_into(buffer[, offset])
+   .. method:: recv_bytes_into(buf[, offset])
 
-      Read into *buffer* a complete message of byte data sent from the other end
+      Read into *buf* a complete message of byte data sent from the other end
       of the connection and return the number of bytes in the message.  Blocks
       until there is something to receive.  Raises
       :exc:`EOFError` if there is nothing left to receive and the other end was
       closed.
 
-      *buffer* must be a writable :term:`bytes-like object`.  If
+      *buf* must be a writable :term:`bytes-like object`.  If
       *offset* is given then the message will be written into the buffer from
       that position.  Offset must be a non-negative integer less than the
-      length of *buffer* (in bytes).
+      length of *buf* (in bytes).
 
       If the buffer is too short then a :exc:`BufferTooShort` exception is
       raised and the complete message is available as ``e.args[0]`` where ``e``

Doc/using/android.rst

@@ -30,7 +30,7 @@ Adding Python to an Android app
 Most app developers should use one of the following tools, which will provide a
 much easier experience:
 
-* `Briefcase <https://briefcase.readthedocs.io>`__, from the BeeWare project
+* `Briefcase <https://briefcase.beeware.org>`__, from the BeeWare project
 * `Buildozer <https://buildozer.readthedocs.io>`__, from the Kivy project
 * `Chaquopy <https://chaquo.com/chaquopy>`__
 * `pyqtdeploy <https://www.riverbankcomputing.com/static/Docs/pyqtdeploy/>`__

Doc/whatsnew/3.15.rst

@@ -142,7 +142,7 @@ In the case where loading a lazily imported module fails (for example, if
 the module does not exist), Python raises the exception at the point of
 first use rather than at import time. The associated traceback includes both
 the location where the name was accessed and the original import statement,
-making it straightforward to diagnose & debug the failure.
+making it straightforward to diagnose and debug the failure.
 
 For cases where you want to enable lazy loading globally without modifying
 source code, Python provides the :option:`-X lazy_imports <-X>` command-line
@@ -451,14 +451,36 @@ Improved error messages
 
   Running this code now produces a clearer suggestion:
 
-  .. code-block:: pycon
+  .. code-block:: pytb
 
      Traceback (most recent call last):
-     File "/home/pablogsal/github/python/main/lel.py", line 42, in <module>
-        print(container.area)
-              ^^^^^^^^^^^^^^
+       File "/home/pablogsal/github/python/main/lel.py", line 42, in <module>
+         print(container.area)
+               ^^^^^^^^^^^^^^
      AttributeError: 'Container' object has no attribute 'area'. Did you mean '.inner.area' instead of '.area'?
 
+* The interpreter now tries to provide a suggestion when
+  :func:`delattr` fails due to a missing attribute.
+  When an attribute name that closely resembles an existing attribute is used,
+  the interpreter will suggest the correct attribute name in the error message.
+  For example:
+
+  .. doctest::
+
+     >>> class A:
+     ...     pass
+     >>> a = A()
+     >>> a.abcde = 1
+     >>> del a.abcdf  # doctest: +ELLIPSIS
+     Traceback (most recent call last):
+     ...
+     AttributeError: 'A' object has no attribute 'abcdf'. Did you mean: 'abcde'?
+
+  (Contributed by Nikita Sobolev and Pranjal Prajapati in :gh:`136588`.)
+
+* Several error messages incorrectly using the term "argument" have been corrected.
+  (Contributed by Stan Ulbrych in :gh:`133382`.)
+
 
 Other language changes
 ======================
@@ -490,28 +512,6 @@ Other language changes
 
   (Contributed by Adam Turner in :gh:`133711`; PEP 686 written by Inada Naoki.)
 
-* Several error messages incorrectly using the term "argument" have been corrected.
-  (Contributed by Stan Ulbrych in :gh:`133382`.)
-
-* The interpreter now tries to provide a suggestion when
-  :func:`delattr` fails due to a missing attribute.
-  When an attribute name that closely resembles an existing attribute is used,
-  the interpreter will suggest the correct attribute name in the error message.
-  For example:
-
-  .. doctest::
-
-     >>> class A:
-     ...     pass
-     >>> a = A()
-     >>> a.abcde = 1
-     >>> del a.abcdf  # doctest: +ELLIPSIS
-     Traceback (most recent call last):
-     ...
-     AttributeError: 'A' object has no attribute 'abcdf'. Did you mean: 'abcde'?
-
-  (Contributed by Nikita Sobolev and Pranjal Prajapati in :gh:`136588`.)
-
 * Unraisable exceptions are now highlighted with color by default. This can be
   controlled by :ref:`environment variables <using-on-controlling-color>`.
   (Contributed by Peter Bierma in :gh:`134170`.)
@@ -708,7 +708,7 @@ base64
   (Contributed by Serhiy Storchaka in :gh:`143214` and :gh:`146431`.)
 
 * Added the *ignorechars* parameter in :func:`~base64.b16decode`,
-  :func:`~base64.b32decode`,  :func:`~base64.b32hexdecode`,
+  :func:`~base64.b32decode`, :func:`~base64.b32hexdecode`,
   :func:`~base64.b64decode`, :func:`~base64.b85decode`, and
   :func:`~base64.z85decode`.
   (Contributed by Serhiy Storchaka in :gh:`144001` and :gh:`146431`.)
@@ -880,13 +880,13 @@ inspect
 json
 ----
 
-* Add the *array_hook* parameter to  :func:`~json.load` and
+* Add the *array_hook* parameter to :func:`~json.load` and
   :func:`~json.loads` functions:
   allow a callback for JSON literal array types to customize Python lists in
   the resulting decoded object. Passing combined :class:`frozendict` to
   *object_pairs_hook* param and :class:`tuple` to ``array_hook`` will yield a
   deeply nested immutable Python structure representing the JSON data.
-  (Contributed by Joao S. O. Bueno in :gh:`146440`)
+  (Contributed by Joao S. O. Bueno in :gh:`146440`.)
 
 
 locale
@@ -914,23 +914,11 @@ math
 mimetypes
 ---------
 
-* Add ``application/dicom`` MIME type for ``.dcm`` extension.
-  (Contributed by Benedikt Johannes in :gh:`144217`.)
-* Add ``application/efi``. (Contributed by Charlie Lin in :gh:`145720`.)
-* Add ``application/node`` MIME type for ``.cjs`` extension.
-  (Contributed by John Franey in :gh:`140937`.)
-* Add ``application/toml``. (Contributed by Gil Forcada in :gh:`139959`.)
-* Add ``application/sql`` and ``application/vnd.sqlite3``.
-  (Contributed by Charlie Lin in :gh:`145698`.)
-* Add the following MIME types:
-
-  - ``application/vnd.ms-cab-compressed`` for ``.cab`` extension
-  - ``application/vnd.ms-htmlhelp`` for ``.chm`` extension
-  - ``application/vnd.ms-officetheme`` for ``.thmx`` extension
-
-  (Contributed by Charlie Lin in :gh:`145718`.)
-
-* Add ``image/jxl``. (Contributed by Foolbar in :gh:`144213`.)
+* Add more MIME types.
+  (Contributed by Benedikt Johannes, Charlie Lin, Foolbar, Gil Forcada and
+  John Franey
+  in :gh:`144217`, :gh:`145720`, :gh:`140937`, :gh:`139959`, :gh:`145698`,
+  :gh:`145718` and :gh:`144213`.)
 * Rename ``application/x-texinfo`` to ``application/texinfo``.
   (Contributed by Charlie Lin in :gh:`140165`.)
 * Changed the MIME type for ``.ai`` files to ``application/pdf``.
@@ -1114,7 +1102,7 @@ subprocess
 
   If none of these mechanisms are available, the function falls back to the
   traditional busy loop (non-blocking call and short sleeps).
-  (Contributed by Giampaolo Rodola in :gh:`83069`).
+  (Contributed by Giampaolo Rodola in :gh:`83069`.)
 
 
 symtable
@@ -1171,7 +1159,7 @@ timeit
 
 * Make the target time of :meth:`timeit.Timer.autorange` configurable
   and add ``--target-time`` option to the command-line interface.
-  (Contributed by Alessandro Cucci and Miikka Koskinen in :gh:`140283`.)
+  (Contributed by Alessandro Cucci and Miikka Koskinen in :gh:`80642`.)
 
 
 tkinter
@@ -1216,10 +1204,7 @@ tomllib
     Previously an inline table had to be on a single line and couldn't end
     with a trailing comma. This is now relaxed so that the following is valid:
 
-    .. syntax highlighting needs TOML 1.1.0 support in Pygments,
-       see https://github.com/pygments/pygments/issues/3026
-
-    .. code-block:: text
+    .. code-block:: toml
 
        tbl = {
           key      = "a string",
@@ -1231,15 +1216,15 @@ tomllib
   - Add ``\xHH`` notation to basic strings for codepoints under 255,
     and the ``\e`` escape for the escape character:
 
-    .. code-block:: text
+    .. code-block:: toml
 
        null = "null byte: \x00; letter a: \x61"
        csi = "\e["
 
   - Seconds in datetime and time values are now optional.
     The following are now valid:
 
-    .. code-block:: text
+    .. code-block:: toml
 
        dt = 2010-02-03 14:15
        t  = 14:15
@@ -1421,7 +1406,7 @@ Optimizations
 =============
 
 * ``mimalloc`` is now used as the default allocator for
-  for raw memory allocations such as via :c:func:`PyMem_RawMalloc`
+  raw memory allocations such as via :c:func:`PyMem_RawMalloc`
   for better performance on :term:`free-threaded builds <free-threaded build>`.
   (Contributed by Kumar Aditya in :gh:`144914`.)
 
@@ -1440,7 +1425,7 @@ base64 & binascii
 
 * Implementation for Base32 has been rewritten in C.
   Encoding and decoding is now two orders of magnitude faster.
-  (Contributed by James Seo in :gh:`146192`)
+  (Contributed by James Seo in :gh:`146192`.)
 
 
 csv
@@ -1534,7 +1519,7 @@ The JIT compiler's machine code generator now produces better machine code
 for x86-64 and AArch64 macOS and Linux targets. In general, users should
 experience lower memory usage for generated machine code and more efficient
 machine code versus 3.14.
-(Contributed by Brandt Bucher in :gh:`136528` and :gh:`136528`.
+(Contributed by Brandt Bucher in :gh:`136528` and :gh:`135905`.
 Implementation for AArch64 contributed by Mark Shannon in :gh:`139855`.
 Additional optimizations for AArch64 contributed by Mark Shannon and
 Diego Russo in :gh:`140683` and :gh:`142305`.)
@@ -1557,6 +1542,14 @@ collections.abc
   deprecated since Python 3.12, and is scheduled for removal in Python 3.17.
 
 
+ctypes
+------
+
+* Removed the undocumented function :func:`!ctypes.SetPointerType`,
+  which has been deprecated since Python 3.13.
+  (Contributed by Bénédikt Tran in :gh:`133866`.)
+
+
 datetime
 --------
 
@@ -1566,14 +1559,6 @@ datetime
   (Contributed by Stan Ulbrych and Gregory P. Smith in :gh:`70647`.)
 
 
-ctypes
-------
-
-* Removed the undocumented function :func:`!ctypes.SetPointerType`,
-  which has been deprecated since Python 3.13.
-  (Contributed by Bénédikt Tran in :gh:`133866`.)
-
-
 glob
 ----
 
@@ -1658,6 +1643,9 @@ typing
   or ``TD = TypedDict("TD", {})`` instead.
   (Contributed by Bénédikt Tran in :gh:`133823`.)
 
+* Deprecated :func:`!typing.no_type_check_decorator` has been removed.
+  (Contributed by Nikita Sobolev in :gh:`133601`.)
+
 
 wave
 ----
@@ -1773,8 +1761,6 @@ New deprecations
     :func:`issubclass`, but warnings were not previously emitted if it was
     merely imported or accessed from the :mod:`!typing` module.
 
-  * Deprecated :func:`!typing.no_type_check_decorator` has been removed.
-    (Contributed by Nikita Sobolev in :gh:`133601`.)
 
 * ``__version__``
 
@@ -2061,8 +2047,8 @@ Deprecated C APIs
 
   - :c:macro:`Py_ALIGNED`: Prefer ``alignas`` instead.
   - :c:macro:`PY_FORMAT_SIZE_T`: Use ``"z"`` directly.
-  - :c:macro:`Py_LL` & :c:macro:`Py_ULL`:
-    Use standard suffixes, ``LL`` & ``ULL``.
+  - :c:macro:`Py_LL` and :c:macro:`Py_ULL`:
+    Use standard suffixes, ``LL`` and ``ULL``.
   - :c:macro:`PY_LONG_LONG`, :c:macro:`PY_LLONG_MIN`, :c:macro:`PY_LLONG_MAX`,
     :c:macro:`PY_ULLONG_MAX`, :c:macro:`PY_INT32_T`, :c:macro:`PY_UINT32_T`,
     :c:macro:`PY_INT64_T`, :c:macro:`PY_UINT64_T`, :c:macro:`PY_SIZE_MAX`:

Include/internal/pycore_genobject.h

@@ -33,6 +33,9 @@ PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
 PyAPI_FUNC(PyObject *)_PyCoro_GetAwaitableIter(PyObject *o);
 PyAPI_FUNC(PyObject *)_PyAsyncGenValueWrapperNew(PyThreadState *state, PyObject *);
 
+// Exported for external JIT support
+PyAPI_FUNC(PyObject *) _PyCoro_ComputeOrigin(int origin_depth, _PyInterpreterFrame *current_frame);
+
 extern PyTypeObject _PyCoroWrapper_Type;
 extern PyTypeObject _PyAsyncGenWrappedValue_Type;
 extern PyTypeObject _PyAsyncGenAThrow_Type;

Include/internal/pycore_instruments.h

@@ -122,6 +122,15 @@ typedef struct _PyCoMonitoringData {
 extern int
 _Py_Instrumentation_GetLine(PyCodeObject *code, _PyCoLineInstrumentationData *line_data, int index);
 
+static inline uint8_t
+_PyCode_GetOriginalOpcode(_PyCoLineInstrumentationData *line_data, int index)
+{
+    return line_data->data[index*line_data->bytes_per_entry];
+}
+
+// Exported for external JIT support
+PyAPI_FUNC(uint8_t) _PyCode_Deinstrument(uint8_t opcode);
+
 #ifdef __cplusplus
 }
 #endif