[3.13] gh-78465: Fix error message for cls.__new__(cls, ...) where cls is not instant...

Previous error message suggested to use cls.__new__(), which
obviously does not work. Now the error message is the same as for
cls(...).
(cherry picked from commit c45f4f3ebe34529a8db3a7918e8dd2e9f7ce8e86)

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index c2b407159a57ec6ae8a563a4063ed71cbc2a1dd9..8bed02a158989a8cc121c9ab8f5bae5b17a2152a 100644 (file)
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2269,6 +2269,7 @@ def check_disallow_instantiation(testcase, tp, *args, **kwds):
         qualname = f"{name}"
     msg = f"cannot create '{re.escape(qualname)}' instances"
     testcase.assertRaisesRegex(TypeError, msg, tp, *args, **kwds)
+    testcase.assertRaisesRegex(TypeError, msg, tp.__new__, tp, *args, **kwds)
 
 def get_recursion_depth():
     """Get the recursion depth of the caller function.

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 72d51361e0b4d10c75be01f67750b57ff139b7ca..6b37094ed5fc324ac60910b4ad289005254245ca 100644 (file)
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -894,12 +894,7 @@ class SysModuleTest(unittest.TestCase):
     def assert_raise_on_new_sys_type(self, sys_attr):
         # Users are intentionally prevented from creating new instances of
         # sys.flags, sys.version_info, and sys.getwindowsversion.
-        arg = sys_attr
-        attr_type = type(sys_attr)
-        with self.assertRaises(TypeError):
-            attr_type(arg)
-        with self.assertRaises(TypeError):
-            attr_type.__new__(attr_type, arg)
+        support.check_disallow_instantiation(self, type(sys_attr), sys_attr)
 
     def test_sys_flags_no_instantiation(self):
         self.assert_raise_on_new_sys_type(sys.flags)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-06-26-15-25-51.gh-issue-78465.MbDN8X.rst b/Misc/NEWS.d/next/Core and Builtins/2025-06-26-15-25-51.gh-issue-78465.MbDN8X.rst
new file mode 100644 (file)
index 0000000..99734d6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2025-06-26-15-25-51.gh-issue-78465.MbDN8X.rst
@@ -0,0 +1,2 @@
+Fix error message for ``cls.__new__(cls, ...)`` where ``cls`` is not
+instantiable builtin or extension type (with ``tp_new`` set to ``NULL``).

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 2b63c1bbfab3379d0f042f633411fb0db61a86e2..2dface4b7582240f556ed36c1aef5765c5f182f5 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -9087,6 +9087,11 @@ tp_new_wrapper(PyObject *self, PyObject *args, PyObject *kwds)
     /* If staticbase is NULL now, it is a really weird type.
        In the spirit of backwards compatibility (?), just shut up. */
     if (staticbase && staticbase->tp_new != type->tp_new) {
+        if (staticbase->tp_new == NULL) {
+            PyErr_Format(PyExc_TypeError,
+                         "cannot create '%s' instances", subtype->tp_name);
+            return NULL;
+        }
         PyErr_Format(PyExc_TypeError,
                      "%s.__new__(%s) is not safe, use %s.__new__()",
                      type->tp_name,