From ce16424b0bb430568c95691cb0439d28152e58bf Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 22 Mar 2015 09:45:35 +0200 Subject: Issue #22079: Py3k warning now is issued in PyType_Ready() instead of raising TypeError when statically allocated type subclasses dynamically allocated type --- Objects/typeobject.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 6055cd9..22def74 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4074,16 +4074,19 @@ PyType_Ready(PyTypeObject *type) } /* All bases of statically allocated type should be statically allocated */ - if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) + if (Py_Py3kWarningFlag && !(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) for (i = 0; i < n; i++) { PyObject *b = PyTuple_GET_ITEM(bases, i); if (PyType_Check(b) && (((PyTypeObject *)b)->tp_flags & Py_TPFLAGS_HEAPTYPE)) { - PyErr_Format(PyExc_TypeError, - "type '%.100s' is not dynamically allocated but " - "its base type '%.100s' is dynamically allocated", - type->tp_name, ((PyTypeObject *)b)->tp_name); - goto error; + char buf[300]; + PyOS_snprintf(buf, sizeof(buf), + "type '%.100s' is not dynamically allocated but " + "its base type '%.100s' is dynamically allocated", + type->tp_name, ((PyTypeObject *)b)->tp_name); + if (PyErr_WarnPy3k(buf, 1) < 0) + goto error; + break; } } -- cgit v0.12