gh-119775: Remove ability to create immutable types with mutable bases (#119776)

sobolevn · web-flow · commit 4aed319a8eb6 · 2024-06-02T07:27:20.000Z
diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
@@ -258,3 +258,5 @@ Deprecated
 Removed
 -------
 
+* Creating :c:data:`immutable types <Py_TPFLAGS_IMMUTABLETYPE>` with mutable
+  bases was deprecated since 3.12 and now raises a :exc:`TypeError`.
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
@@ -777,33 +777,11 @@ def test_pytype_fromspec_with_repeated_slots(self):
                 with self.assertRaises(SystemError):
                     _testcapi.create_type_from_repeated_slots(variant)
 
-    @warnings_helper.ignore_warnings(category=DeprecationWarning)
     def test_immutable_type_with_mutable_base(self):
-        # Add deprecation warning here so it's removed in 3.14
-        warnings._deprecated(
-            'creating immutable classes with mutable bases', remove=(3, 14))
-
-        class MutableBase:
-            def meth(self):
-                return 'original'
-
-        with self.assertWarns(DeprecationWarning):
-            ImmutableSubclass = _testcapi.make_immutable_type_with_base(
-                MutableBase)
-        instance = ImmutableSubclass()
+        class MutableBase: ...
 
-        self.assertEqual(instance.meth(), 'original')
-
-        # Cannot override the static type's method
-        with self.assertRaisesRegex(
-                TypeError,
-                "cannot set 'meth' attribute of immutable type"):
-            ImmutableSubclass.meth = lambda self: 'overridden'
-        self.assertEqual(instance.meth(), 'original')
-
-        # Can change the method on the mutable base
-        MutableBase.meth = lambda self: 'changed'
-        self.assertEqual(instance.meth(), 'changed')
+        with self.assertRaisesRegex(TypeError, 'Creating immutable type'):
+            _testcapi.make_immutable_type_with_base(MutableBase)
 
     def test_pynumber_tobase(self):
         from _testcapi import pynumber_tobase
diff --git a/Misc/NEWS.d/next/C API/2024-05-30-12-51-21.gh-issue-119775.CBq9IG.rst b/Misc/NEWS.d/next/C API/2024-05-30-12-51-21.gh-issue-119775.CBq9IG.rst
@@ -0,0 +1,2 @@
+Creating :c:data:`immutable types <Py_TPFLAGS_IMMUTABLETYPE>` with mutable
+bases was deprecated since 3.12 and now raises a :exc:`TypeError`.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -4613,16 +4613,12 @@ _PyType_FromMetaclass_impl(
                 goto finally;
             }
             if (!_PyType_HasFeature(b, Py_TPFLAGS_IMMUTABLETYPE)) {
-                if (PyErr_WarnFormat(
-                    PyExc_DeprecationWarning,
-                    0,
-                    "Creating immutable type %s from mutable base %s is "
-                    "deprecated, and slated to be disallowed in Python 3.14.",
-                    spec->name,
-                    b->tp_name))
-                {
-                    goto finally;
-                }
+                PyErr_Format(
+                    PyExc_TypeError,
+                    "Creating immutable type %s from mutable base %N",
+                    spec->name, b
+                );
+                goto finally;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Creating :c:data:`immutable types <Py_TPFLAGS_IMMUTABLETYPE>` with mutable
	`2`	+bases was deprecated since 3.12 and now raises a :exc:`TypeError`.
Original file line number	Diff line number	Diff line change
`@@ -4613,16 +4613,12 @@ _PyType_FromMetaclass_impl(`
`4613`	`4613`	`goto finally;`
`4614`	`4614`	`}`
`4615`	`4615`	`if (!_PyType_HasFeature(b, Py_TPFLAGS_IMMUTABLETYPE)) {`
`4616`		`- if (PyErr_WarnFormat(`
`4617`		`- PyExc_DeprecationWarning,`
`4618`		`- 0,`
`4619`		`- "Creating immutable type %s from mutable base %s is "`
`4620`		`- "deprecated, and slated to be disallowed in Python 3.14.",`
`4621`		`- spec->name,`
`4622`		`- b->tp_name))`
`4623`		`- {`
`4624`		`- goto finally;`
`4625`		`- }`
	`4616`	`+ PyErr_Format(`
	`4617`	`+ PyExc_TypeError,`
	`4618`	`+ "Creating immutable type %s from mutable base %N",`
	`4619`	`+ spec->name, b`
	`4620`	`+ );`
	`4621`	`+ goto finally;`
`4626`	`4622`	`}`
`4627`	`4623`	`}`
`4628`	`4624`	`}`