Merge branch 'main' into dataclass-lazy-inspect

danielhollas · danielhollas · commit 3901a4c60de5 · 2026-02-12T18:03:33.000Z
diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
@@ -74,10 +74,10 @@ jobs:
         include:
           - target: i686-pc-windows-msvc/msvc
             architecture: Win32
-            runner: windows-2022
+            runner: windows-2025
           - target: x86_64-pc-windows-msvc/msvc
             architecture: x64
-            runner: windows-2022
+            runner: windows-2025
           - target: aarch64-pc-windows-msvc/msvc
             architecture: ARM64
             runner: windows-11-arm
diff --git a/.github/workflows/reusable-windows-msi.yml b/.github/workflows/reusable-windows-msi.yml
@@ -17,7 +17,7 @@ env:
 jobs:
   build:
     name: installer for ${{ inputs.arch }}
-    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
+    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     timeout-minutes: 60
     env:
       ARCH: ${{ inputs.arch }}
diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   build:
     name: Build and test (${{ inputs.arch }})
-    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
+    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
     timeout-minutes: 60
     env:
       ARCH: ${{ inputs.arch }}
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
@@ -123,6 +123,7 @@ System includes
    * ``<limits.h>``
    * ``<math.h>``
    * ``<stdarg.h>``
+   * ``<string.h>``
    * ``<wchar.h>``
    * ``<sys/types.h>`` (if present)
 
@@ -138,7 +139,6 @@ System includes
    * ``<errno.h>``
    * ``<stdio.h>``
    * ``<stdlib.h>``
-   * ``<string.h>``
 
 .. note::
 
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
@@ -2689,6 +2689,12 @@ For the :meth:`.datetime.strptime` and :meth:`.date.strptime` class methods,
 the default value is ``1900-01-01T00:00:00.000``: any components not specified
 in the format string will be pulled from the default value.
 
+.. note::
+   Format strings without separators can be ambiguous for parsing. For
+   example, with ``%Y%m%d``, the string ``2026111`` may be parsed either as
+   ``2026-11-01`` or as ``2026-01-11``.
+   Use separators to ensure the input is parsed as intended.
+
 .. note::
    When used to parse partial dates lacking a year, :meth:`.datetime.strptime`
    and :meth:`.date.strptime` will raise when encountering February 29 because
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
@@ -2183,7 +2183,7 @@ expression support in the :mod:`re` module).
    Return ``True`` if all characters in the string are alphanumeric and there is at
    least one character, ``False`` otherwise.  A character ``c`` is alphanumeric if one
    of the following returns ``True``: ``c.isalpha()``, ``c.isdecimal()``,
-   ``c.isdigit()``, or ``c.isnumeric()``. For example::
+   ``c.isdigit()``, or ``c.isnumeric()``. For example:
 
    .. doctest::
 
diff --git a/Include/Python.h b/Include/Python.h
@@ -22,12 +22,13 @@
 #include <limits.h>               // INT_MAX
 #include <math.h>                 // HUGE_VAL
 #include <stdarg.h>               // va_list
+#include <string.h>               // memcpy()
 #include <wchar.h>                // wchar_t
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>          // ssize_t
 #endif
 
-// <errno.h>, <stdio.h>, <stdlib.h> and <string.h> headers are no longer used
+// <errno.h>, <stdio.h> and <stdlib.h> headers are no longer used
 // by Python, but kept for the backward compatibility of existing third party C
 // extensions. They are not included by limited C API version 3.11 and newer.
 //
@@ -37,7 +38,6 @@
 #  include <errno.h>              // errno
 #  include <stdio.h>              // FILE*
 #  include <stdlib.h>             // getenv()
-#  include <string.h>             // memcpy()
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030d0000
 #  include <ctype.h>              // tolower()
diff --git a/Include/import.h b/Include/import.h
@@ -91,7 +91,7 @@ PyAPI_FUNC(int) PyImport_AppendInittab(
 typedef enum {
     PyImport_LAZY_NORMAL,
     PyImport_LAZY_ALL,
-    PyImport_LAZY_NONE,
+    PyImport_LAZY_NONE
 } PyImport_LazyImportsMode;
 
 #ifndef Py_LIMITED_API
diff --git a/Include/pyport.h b/Include/pyport.h
@@ -567,8 +567,11 @@ extern "C" {
 //
 // Example: _Py_TYPEOF(x) x_copy = (x);
 //
-// The macro is only defined if GCC or clang compiler is used.
-#if defined(__GNUC__) || defined(__clang__)
+// On C23, use typeof(). Otherwise, the macro is only defined
+// if GCC or clang compiler is used.
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 202311L
+#  define _Py_TYPEOF(expr) typeof(expr)
+#elif defined(__GNUC__) || defined(__clang__)
 #  define _Py_TYPEOF(expr) __typeof__(expr)
 #endif
 
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
@@ -44,7 +44,7 @@ def __eq__(self, other):
                                "Or did you forget to import 'abc'?\n"),
             ('int.reel', AttributeError,
                  "type object 'int' has no attribute 'reel'. "
-                 "Did you mean: 'real'?\n"),
+                 "Did you mean '.real' instead of '.reel'?\n"),
             )
 
     @force_not_colorized
diff --git a/Lib/test/test_cext/extension.c b/Lib/test/test_cext/extension.c
@@ -76,7 +76,7 @@ static PyMethodDef _testcext_methods[] = {
 static int
 _testcext_exec(PyObject *module)
 {
-    PyObject *result;
+    PyObject *result, *obj;
 
 #ifdef __STDC_VERSION__
     if (PyModule_AddIntMacro(module, __STDC_VERSION__) < 0) {
@@ -92,6 +92,10 @@ _testcext_exec(PyObject *module)
     Py_BUILD_ASSERT(sizeof(int) == sizeof(unsigned int));
     assert(Py_BUILD_ASSERT_EXPR(sizeof(int) == sizeof(unsigned int)) == 0);
 
+    // Test Py_CLEAR()
+    obj = NULL;
+    Py_CLEAR(obj);
+
     return 0;
 }
 
diff --git a/Lib/test/test_peg_generator/test_c_parser.py b/Lib/test/test_peg_generator/test_c_parser.py
@@ -356,9 +356,9 @@ def test_same_name_different_types(self) -> None:
         grammar_source = """
         start[mod_ty]: a[asdl_stmt_seq*]=import_from+ NEWLINE ENDMARKER { _PyAST_Module(a, NULL, p->arena)}
         import_from[stmt_ty]: ( a='from' !'import' c=simple_name 'import' d=import_as_names_from {
-                                _PyAST_ImportFrom(c->v.Name.id, d, 0, EXTRA) }
+                                _PyAST_ImportFrom(c->v.Name.id, d, 0, 0, EXTRA) }
                             | a='from' '.' 'import' c=import_as_names_from {
-                                _PyAST_ImportFrom(NULL, c, 1, EXTRA) }
+                                _PyAST_ImportFrom(NULL, c, 1, 0, EXTRA) }
                             )
         simple_name[expr_ty]: NAME
         import_as_names_from[asdl_alias_seq*]: a[asdl_alias_seq*]=','.import_as_name_from+ { a }
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
@@ -4176,39 +4176,39 @@ class CaseChangeOverSubstitution:
             BLuch = None
 
         for cls, suggestion in [
-            (Addition, "'bluchin'?"),
-            (Substitution, "'blech'?"),
-            (Elimination, "'blch'?"),
-            (Addition, "'bluchin'?"),
-            (SubstitutionOverElimination, "'blach'?"),
-            (SubstitutionOverAddition, "'blach'?"),
-            (EliminationOverAddition, "'bluc'?"),
-            (CaseChangeOverSubstitution, "'BLuch'?"),
+            (Addition, "'.bluchin'"),
+            (Substitution, "'.blech'"),
+            (Elimination, "'.blch'"),
+            (Addition, "'.bluchin'"),
+            (SubstitutionOverElimination, "'.blach'"),
+            (SubstitutionOverAddition, "'.blach'"),
+            (EliminationOverAddition, "'.bluc'"),
+            (CaseChangeOverSubstitution, "'.BLuch'"),
         ]:
             actual = self.get_suggestion(cls(), 'bluch')
-            self.assertIn(suggestion, actual)
+            self.assertIn('Did you mean ' + suggestion, actual)
 
     def test_suggestions_underscored(self):
         class A:
             bluch = None
 
-        self.assertIn("'bluch'", self.get_suggestion(A(), 'blach'))
-        self.assertIn("'bluch'", self.get_suggestion(A(), '_luch'))
-        self.assertIn("'bluch'", self.get_suggestion(A(), '_bluch'))
+        self.assertIn("'.bluch'", self.get_suggestion(A(), 'blach'))
+        self.assertIn("'.bluch'", self.get_suggestion(A(), '_luch'))
+        self.assertIn("'.bluch'", self.get_suggestion(A(), '_bluch'))
 
         attr_function = self.attr_function
         class B:
             _bluch = None
             def method(self, name):
                 attr_function(self, name)
 
-        self.assertIn("'_bluch'", self.get_suggestion(B(), '_blach'))
-        self.assertIn("'_bluch'", self.get_suggestion(B(), '_luch'))
-        self.assertNotIn("'_bluch'", self.get_suggestion(B(), 'bluch'))
+        self.assertIn("'._bluch'", self.get_suggestion(B(), '_blach'))
+        self.assertIn("'._bluch'", self.get_suggestion(B(), '_luch'))
+        self.assertNotIn("'._bluch'", self.get_suggestion(B(), 'bluch'))
 
-        self.assertIn("'_bluch'", self.get_suggestion(partial(B().method, '_blach')))
-        self.assertIn("'_bluch'", self.get_suggestion(partial(B().method, '_luch')))
-        self.assertIn("'_bluch'", self.get_suggestion(partial(B().method, 'bluch')))
+        self.assertIn("'._bluch'", self.get_suggestion(partial(B().method, '_blach')))
+        self.assertIn("'._bluch'", self.get_suggestion(partial(B().method, '_luch')))
+        self.assertIn("'._bluch'", self.get_suggestion(partial(B().method, 'bluch')))
 
 
     def test_do_not_trigger_for_long_attributes(self):
@@ -4256,16 +4256,18 @@ class A:
             ﬁⁿₐˡᵢᶻₐᵗᵢᵒₙ = None
 
         suggestion = self.get_suggestion(A(), 'ﬁⁿₐˡᵢᶻₐᵗᵢᵒₙ')
-        self.assertIn("'finalization'", suggestion)
+        self.assertIn("'.finalization'", suggestion)
         self.assertNotIn("analization", suggestion)
 
         class B:
             attr_a = None
             attr_µ = None  # attr_\xb5
 
         suggestion = self.get_suggestion(B(), 'attr_\xb5')
-        self.assertIn("'attr_\u03bc'", suggestion)
-        self.assertIn(r"'attr_\u03bc'", suggestion)
+        self.assertIn(
+            "'.attr_\u03bc' ('attr_\\u03bc') "
+            "instead of '.attr_\xb5' ('attr_\\xb5')",
+            suggestion)
         self.assertNotIn("attr_a", suggestion)
 
 
@@ -4371,11 +4373,11 @@ def __init__(self):
 
         # Should suggest 'inner.value'
         actual = self.get_suggestion(Outer(), 'value')
-        self.assertIn("Did you mean: 'inner.value'", actual)
+        self.assertIn("Did you mean '.inner.value' instead of '.value'", actual)
 
         # Should suggest 'inner.data'
         actual = self.get_suggestion(Outer(), 'data')
-        self.assertIn("Did you mean: 'inner.data'", actual)
+        self.assertIn("Did you mean '.inner.data' instead of '.data'", actual)
 
     def test_getattr_nested_prioritizes_direct_matches(self):
         # Test that direct attribute matches are prioritized over nested ones
@@ -4390,7 +4392,7 @@ def __init__(self):
 
         # Should suggest 'fooo' (direct) not 'inner.foo' (nested)
         actual = self.get_suggestion(Outer(), 'foo')
-        self.assertIn("Did you mean: 'fooo'", actual)
+        self.assertIn("Did you mean '.fooo'", actual)
         self.assertNotIn("inner.foo", actual)
 
     def test_getattr_nested_with_property(self):
@@ -4487,7 +4489,7 @@ def __init__(self):
 
         # Should suggest only the first match (alphabetically)
         actual = self.get_suggestion(Outer(), 'value')
-        self.assertIn("'a_inner.value'", actual)
+        self.assertIn("'.a_inner.value'", actual)
         # Verify it's a single suggestion, not multiple
         self.assertEqual(actual.count("Did you mean"), 1)
 
@@ -4510,10 +4512,10 @@ def __init__(self):
                 self.exploder = ExplodingProperty()  # Accessing attributes will raise
                 self.safe_inner = SafeInner()
 
-        # Should still suggest 'safe_inner.target' without crashing
+        # Should still suggest '.safe_inner.target' without crashing
         # even though accessing exploder.target would raise an exception
         actual = self.get_suggestion(Outer(), 'target')
-        self.assertIn("'safe_inner.target'", actual)
+        self.assertIn("'.safe_inner.target'", actual)
 
     def test_getattr_nested_handles_hasattr_exceptions(self):
         # Test that exceptions in hasattr don't crash the system
@@ -4534,7 +4536,7 @@ def __init__(self):
 
         # Should still find 'normal.target' even though weird.target check fails
         actual = self.get_suggestion(Outer(), 'target')
-        self.assertIn("'normal.target'", actual)
+        self.assertIn("'.normal.target'", actual)
 
     def make_module(self, code):
         tmpdir = Path(tempfile.mkdtemp())
diff --git a/Lib/test/test_ucn.py b/Lib/test/test_ucn.py
@@ -88,6 +88,9 @@ def test_hangul_syllables(self):
         self.checkletter("HANGUL SYLLABLE HWEOK", "\ud6f8")
         self.checkletter("HANGUL SYLLABLE HIH", "\ud7a3")
 
+        self.checkletter("haNGul SYllABle WAe", '\uc65c')
+        self.checkletter("HAngUL syLLabLE waE", '\uc65c')
+
         self.assertRaises(ValueError, unicodedata.name, "\ud7a4")
 
     def test_cjk_unified_ideographs(self):
@@ -103,6 +106,11 @@ def test_cjk_unified_ideographs(self):
         self.checkletter("CJK UNIFIED IDEOGRAPH-2B81D", "\U0002B81D")
         self.checkletter("CJK UNIFIED IDEOGRAPH-3134A", "\U0003134A")
 
+        self.checkletter("cjK UniFIeD idEogRAph-3aBc", "\u3abc")
+        self.checkletter("CJk uNIfiEd IDeOGraPH-3AbC", "\u3abc")
+        self.checkletter("cjK UniFIeD idEogRAph-2aBcD", "\U0002abcd")
+        self.checkletter("CJk uNIfiEd IDeOGraPH-2AbCd", "\U0002abcd")
+
     def test_bmp_characters(self):
         for code in range(0x10000):
             char = chr(code)
diff --git a/Lib/traceback.py b/Lib/traceback.py
@@ -1128,7 +1128,16 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
                 self._str += (". Site initialization is disabled, did you forget to "
                     + "add the site-packages directory to sys.path "
                     + "or to enable your virtual environment?")
-        elif exc_type and issubclass(exc_type, (NameError, AttributeError)) and \
+        elif exc_type and issubclass(exc_type, AttributeError) and \
+                getattr(exc_value, "name", None) is not None:
+            wrong_name = getattr(exc_value, "name", None)
+            suggestion = _compute_suggestion_error(exc_value, exc_traceback, wrong_name)
+            if suggestion:
+                if suggestion.isascii():
+                    self._str += f". Did you mean '.{suggestion}' instead of '.{wrong_name}'?"
+                else:
+                    self._str += f". Did you mean '.{suggestion}' ({suggestion!a}) instead of '.{wrong_name}' ({wrong_name!a})?"
+        elif exc_type and issubclass(exc_type, NameError) and \
                 getattr(exc_value, "name", None) is not None:
             wrong_name = getattr(exc_value, "name", None)
             suggestion = _compute_suggestion_error(exc_value, exc_traceback, wrong_name)
@@ -1137,13 +1146,11 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,
                     self._str += f". Did you mean: '{suggestion}'?"
                 else:
                     self._str += f". Did you mean: '{suggestion}' ({suggestion!a})?"
-            if issubclass(exc_type, NameError):
-                wrong_name = getattr(exc_value, "name", None)
-                if wrong_name is not None and wrong_name in sys.stdlib_module_names:
-                    if suggestion:
-                        self._str += f" Or did you forget to import '{wrong_name}'?"
-                    else:
-                        self._str += f". Did you forget to import '{wrong_name}'?"
+            if wrong_name is not None and wrong_name in sys.stdlib_module_names:
+                if suggestion:
+                    self._str += f" Or did you forget to import '{wrong_name}'?"
+                else:
+                    self._str += f". Did you forget to import '{wrong_name}'?"
         if lookup_lines:
             self._load_lines()
         self.__suppress_context__ = \
diff --git a/Misc/NEWS.d/next/C_API/2026-02-10-14-49-49.gh-issue-121617.57vMqa.rst b/Misc/NEWS.d/next/C_API/2026-02-10-14-49-49.gh-issue-121617.57vMqa.rst
@@ -0,0 +1,3 @@
+``Python.h`` now also includes ``<string.h>`` in the limited C API version 3.11
+and newer to fix the :c:macro:`Py_CLEAR` macro which uses ``memcpy()``. Patch
+by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2023-07-26-00-03-00.gh-issue-80667.N7Dh8B.rst b/Misc/NEWS.d/next/Core_and_Builtins/2023-07-26-00-03-00.gh-issue-80667.N7Dh8B.rst
@@ -0,0 +1,2 @@
+Literals using the ``\N{name}`` escape syntax can now construct CJK
+ideographs and Hangul syllables using case-insensitive names.
diff --git a/Misc/NEWS.d/next/Library/2026-02-07-16-31-42.gh-issue-144285.iyH9iL.rst b/Misc/NEWS.d/next/Library/2026-02-07-16-31-42.gh-issue-144285.iyH9iL.rst
@@ -0,0 +1,3 @@
+Attribute suggestions in :exc:`AttributeError` tracebacks are now formatted differently
+to make them easier to understand, for example: ``Did you mean '.datetime.now' instead of '.now'``.
+Contributed by Bartosz Sławecki.
diff --git a/Modules/expat/refresh.sh b/Modules/expat/refresh.sh
@@ -64,13 +64,16 @@ This may be due to source changes and will require updating this script" >&2
   exit 1
 fi
 
-echo "
+echo '
 Updated! next steps:
 - Verify all is okay:
     git diff
     git status
-- Regenerate the sbom file
+- Update the sbom file:
+    Under the package "SPDXRef-PACKAGE-expat", update the "checksumValue",
+    "downloadLocation", "referenceLocator", and "versionInfo" fields.
+- Regenerate the sbom file:
     make regen-sbom
-- Update warning count in Tools/build/.warningignore_macos
+- Update the warning count in Tools/build/.warningignore_macos:
     (use info from CI if not on a Mac)
-"
+'
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
diff --git a/Python/specialize.c b/Python/specialize.c

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def __eq__(self, other):`
`44`	`44`	`"Or did you forget to import 'abc'?\n"),`
`45`	`45`	`('int.reel', AttributeError,`
`46`	`46`	`"type object 'int' has no attribute 'reel'. "`
`47`		`- "Did you mean: 'real'?\n"),`
	`47`	`+ "Did you mean '.real' instead of '.reel'?\n"),`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`@force_not_colorized`