Merge branch 'main' into fix-issue-128016

Author: umarbutler

Doc/c-api/long.rst

@@ -657,7 +657,7 @@ distinguished from a number.  Use :c:func:`PyErr_Occurred` to disambiguate.
 Export API
 ^^^^^^^^^^
 
-.. versionadded:: next
+.. versionadded:: 3.14
 
 .. c:struct:: PyLongLayout
 
@@ -769,7 +769,7 @@ PyLongWriter API
 
 The :c:type:`PyLongWriter` API can be used to import an integer.
 
-.. versionadded:: next
+.. versionadded:: 3.14
 
 .. c:struct:: PyLongWriter
 

Doc/library/ctypes.rst

@@ -1964,7 +1964,7 @@ Utility functions
 
    .. availability:: Windows
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
 
 .. function:: cast(obj, type)
@@ -2825,4 +2825,4 @@ Exceptions
 
    .. availability:: Windows
 
-   .. versionadded:: next
+   .. versionadded:: 3.14

Doc/library/errno.rst

@@ -617,7 +617,7 @@ defined by the module.  The specific list of defined symbols is available as
 
    Memory page has hardware error.
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
 
 .. data:: EALREADY

Doc/library/select.rst

@@ -324,7 +324,7 @@ Edge and Level Trigger Polling (epoll) Objects
       :const:`EPOLLEXCLUSIVE` was added.  It's only supported by Linux Kernel 4.5
       or later.
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
       :const:`EPOLLWAKEUP` was added. It's only supported by Linux Kernel 3.5
       or later.
 

Doc/library/stdtypes.rst

@@ -4153,7 +4153,7 @@ copying.
 
       Count the number of occurrences of *value*.
 
-      .. versionadded:: next
+      .. versionadded:: 3.14
 
   .. method:: index(value, start=0, stop=sys.maxsize, /)
 
@@ -4162,7 +4162,7 @@ copying.
 
       Raises a :exc:`ValueError` if *value* cannot be found.
 
-      .. versionadded:: next
+      .. versionadded:: 3.14
 
    There are also several readonly attributes available:
 

Include/internal/pycore_pyerrors.h

@@ -130,6 +130,18 @@ PyAPI_FUNC(void) _PyErr_SetString(
     PyObject *exception,
     const char *string);
 
+/*
+ * Set an exception with the error message decoded from the current locale
+ * encoding (LC_CTYPE).
+ *
+ * Exceptions occurring in decoding take priority over the desired exception.
+ *
+ * Exported for '_ctypes' shared extensions.
+ */
+PyAPI_FUNC(void) _PyErr_SetLocaleString(
+    PyObject *exception,
+    const char *string);
+
 PyAPI_FUNC(PyObject*) _PyErr_Format(
     PyThreadState *tstate,
     PyObject *exception,

Include/patchlevel.h

@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        14
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL       2
+#define PY_RELEASE_SERIAL       3
 
 /* Version as a string */
-#define PY_VERSION              "3.14.0a2+"
+#define PY_VERSION              "3.14.0a3+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/pydoc_data/topics.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Tue Nov 19 16:52:22 2024
+# Autogenerated by Sphinx on Tue Dec 17 11:49:52 2024
 # as part of the release process.
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
@@ -1312,15 +1312,19 @@
            'The arguments must either both be numbers, or one argument must be '
            'an\n'
            'integer and the other must be a sequence. In the former case, the\n'
-           'numbers are converted to a common type and then multiplied '
-           'together.\n'
-           'In the latter case, sequence repetition is performed; a negative\n'
-           'repetition factor yields an empty sequence.\n'
+           'numbers are converted to a common real type and then multiplied\n'
+           'together.  In the latter case, sequence repetition is performed; '
+           'a\n'
+           'negative repetition factor yields an empty sequence.\n'
            '\n'
            'This operation can be customized using the special "__mul__()" '
            'and\n'
            '"__rmul__()" methods.\n'
            '\n'
+           'Changed in version 3.14: If only one operand is a complex number, '
+           'the\n'
+           'other operand is converted to a floating-point number.\n'
+           '\n'
            'The "@" (at) operator is intended to be used for matrix\n'
            'multiplication.  No builtin Python types implement this operator.\n'
            '\n'
@@ -1391,21 +1395,30 @@
            'arguments must either both be numbers or both be sequences of the '
            'same\n'
            'type.  In the former case, the numbers are converted to a common '
-           'type\n'
-           'and then added together. In the latter case, the sequences are\n'
+           'real\n'
+           'type and then added together. In the latter case, the sequences '
+           'are\n'
            'concatenated.\n'
            '\n'
            'This operation can be customized using the special "__add__()" '
            'and\n'
            '"__radd__()" methods.\n'
            '\n'
+           'Changed in version 3.14: If only one operand is a complex number, '
+           'the\n'
+           'other operand is converted to a floating-point number.\n'
+           '\n'
            'The "-" (subtraction) operator yields the difference of its '
            'arguments.\n'
-           'The numeric arguments are first converted to a common type.\n'
+           'The numeric arguments are first converted to a common real type.\n'
            '\n'
            'This operation can be customized using the special "__sub__()" '
            'and\n'
-           '"__rsub__()" methods.\n',
+           '"__rsub__()" methods.\n'
+           '\n'
+           'Changed in version 3.14: If only one operand is a complex number, '
+           'the\n'
+           'other operand is converted to a floating-point number.\n',
  'bitwise': 'Binary bitwise operations\n'
             '*************************\n'
             '\n'
@@ -4561,18 +4574,18 @@
                 '\n'
                 'When a description of an arithmetic operator below uses the '
                 'phrase\n'
-                '“the numeric arguments are converted to a common type”, this '
-                'means\n'
-                'that the operator implementation for built-in types works as '
+                '“the numeric arguments are converted to a common real type”, '
+                'this\n'
+                'means that the operator implementation for built-in types '
+                'works as\n'
                 'follows:\n'
                 '\n'
-                '* If either argument is a complex number, the other is '
-                'converted to\n'
-                '  complex;\n'
+                '* If both arguments are complex numbers, no conversion is '
+                'performed;\n'
                 '\n'
-                '* otherwise, if either argument is a floating-point number, '
-                'the other\n'
-                '  is converted to floating point;\n'
+                '* if either argument is a complex or a floating-point number, '
+                'the\n'
+                '  other is converted to a floating-point number;\n'
                 '\n'
                 '* otherwise, both must be integers and no conversion is '
                 'necessary.\n'
@@ -7144,8 +7157,12 @@
                   'trailing zeros are not removed from the result.\n'
                   '\n'
                   'The "\',\'" option signals the use of a comma for a '
-                  'thousands separator.\n'
-                  'For a locale aware separator, use the "\'n\'" integer '
+                  'thousands separator\n'
+                  'for floating-point presentation types and for integer '
+                  'presentation\n'
+                  'type "\'d\'". For other presentation types, this option is '
+                  'an error. For\n'
+                  'a locale aware separator, use the "\'n\'" integer '
                   'presentation type\n'
                   'instead.\n'
                   '\n'

Lib/test/libregrtest/setup.py

@@ -11,7 +11,7 @@
 from .filter import set_match_tests
 from .runtests import RunTests
 from .utils import (
-    setup_unraisable_hook, setup_threading_excepthook, fix_umask,
+    setup_unraisable_hook, setup_threading_excepthook,
     adjust_rlimit_nofile)
 
 
@@ -26,8 +26,6 @@ def setup_test_dir(testdir: str | None) -> None:
 
 
 def setup_process() -> None:
-    fix_umask()
-
     assert sys.__stderr__ is not None, "sys.__stderr__ is None"
     try:
         stderr_fd = sys.__stderr__.fileno()

Lib/test/libregrtest/utils.py

@@ -478,17 +478,6 @@ def get_temp_dir(tmp_dir: StrPath | None = None) -> StrPath:
     return os.path.abspath(tmp_dir)
 
 
-def fix_umask() -> None:
-    if support.is_emscripten:
-        # Emscripten has default umask 0o777, which breaks some tests.
-        # see https://github.com/emscripten-core/emscripten/issues/17269
-        old_mask = os.umask(0)
-        if old_mask == 0o777:
-            os.umask(0o027)
-        else:
-            os.umask(old_mask)
-
-
 def get_work_dir(parent_dir: StrPath, worker: bool = False) -> StrPath:
     # Define a writable temp dir that will be used as cwd while running
     # the tests. The name of the dir includes the pid to allow parallel