Merge branch 'main' into gh-41872

Author: srinivasreddy

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/asyncio-policy.rst

@@ -46,6 +46,10 @@ for the current process:
 
    If *policy* is set to ``None``, the default policy is restored.
 
+   .. deprecated:: next
+      The :func:`set_event_loop_policy` function is deprecated and
+      will be removed in Python 3.16.
+
 
 .. _asyncio-policy-objects:
 

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/asyncio/events.py

@@ -8,7 +8,9 @@
     'AbstractEventLoopPolicy',
     'AbstractEventLoop', 'AbstractServer',
     'Handle', 'TimerHandle',
-    'get_event_loop_policy', 'set_event_loop_policy',
+    'get_event_loop_policy',
+    '_set_event_loop_policy',
+    'set_event_loop_policy',
     'get_event_loop', 'set_event_loop', 'new_event_loop',
     '_set_running_loop', 'get_running_loop',
     '_get_running_loop',
@@ -21,6 +23,7 @@
 import subprocess
 import sys
 import threading
+import warnings
 
 from . import format_helpers
 
@@ -765,7 +768,7 @@ def get_event_loop_policy():
     return _event_loop_policy
 
 
-def set_event_loop_policy(policy):
+def _set_event_loop_policy(policy):
     """Set the current event loop policy.
 
     If policy is None, the default policy is restored."""
@@ -774,6 +777,9 @@ def set_event_loop_policy(policy):
         raise TypeError(f"policy must be an instance of AbstractEventLoopPolicy or None, not '{type(policy).__name__}'")
     _event_loop_policy = policy
 
+def set_event_loop_policy(policy):
+    warnings._deprecated('set_event_loop_policy', remove=(3,16))
+    _set_event_loop_policy(policy)
 
 def get_event_loop():
     """Return an asyncio event loop.

Lib/idlelib/pyshell.py

@@ -424,7 +424,9 @@ def __init__(self, tkconsole):
     def spawn_subprocess(self):
         if self.subprocess_arglist is None:
             self.subprocess_arglist = self.build_subprocess_arglist()
-        self.rpcsubproc = subprocess.Popen(self.subprocess_arglist)
+        # gh-127060: Disable traceback colors
+        env = dict(os.environ, TERM='dumb')
+        self.rpcsubproc = subprocess.Popen(self.subprocess_arglist, env=env)
 
     def build_subprocess_arglist(self):
         assert (self.port!=0), (