mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-123909: PyType_From*: Disallow metaclasses with custom tp_new (GH-123947)

Browse source
This commit is contained in:
Petr Viktorin 2024-09-13 13:18:49 +02:00 • committed by GitHub
parent d7e83398c1
commit 432bf31327
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 34 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Objects/typeobject.c
View file

@ -4668,10 +4668,10 @@ special_offset_from_member(
return -1;
}
static PyObject *
_PyType_FromMetaclass_impl(
PyObject *
PyType_FromMetaclass(
PyTypeObject *metaclass, PyObject *module,
PyType_Spec *spec, PyObject *bases_in, int _allow_tp_new)
PyType_Spec *spec, PyObject *bases_in)
{
/* Invariant: A non-NULL value in one of these means this function holds
* a strong reference or owns allocated memory.
@ -4848,21 +4848,10 @@ _PyType_FromMetaclass_impl(
goto finally;
}
if (metaclass->tp_new && metaclass->tp_new != PyType_Type.tp_new) {
if (_allow_tp_new) {
if (PyErr_WarnFormat(
PyExc_DeprecationWarning, 1,
"Type %s uses PyType_Spec with a metaclass that has custom "
"tp_new. This is deprecated and will no longer be allowed in "
"Python 3.14.", spec->name) < 0) {
goto finally;
}
}
else {
PyErr_SetString(
PyExc_TypeError,
"Metaclasses with custom tp_new are not supported.");
goto finally;
}
PyErr_SetString(
PyExc_TypeError,
"Metaclasses with custom tp_new are not supported.");
goto finally;
}
/* Calculate best base, and check that all bases are type objects */
@ -5109,29 +5098,22 @@ _PyType_FromMetaclass_impl(
return (PyObject*)res;
}
PyObject *
PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
PyType_Spec *spec, PyObject *bases_in)
{
return _PyType_FromMetaclass_impl(metaclass, module, spec, bases_in, 0);
}
PyObject *
PyType_FromModuleAndSpec(PyObject *module, PyType_Spec *spec, PyObject *bases)
{
return _PyType_FromMetaclass_impl(NULL, module, spec, bases, 1);
return PyType_FromMetaclass(NULL, module, spec, bases);
}
PyObject *
PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
{
return _PyType_FromMetaclass_impl(NULL, NULL, spec, bases, 1);
return PyType_FromMetaclass(NULL, NULL, spec, bases);
}
PyObject *
PyType_FromSpec(PyType_Spec *spec)
{
return _PyType_FromMetaclass_impl(NULL, NULL, spec, NULL, 1);
return PyType_FromMetaclass(NULL, NULL, spec, NULL);
}
PyObject *