mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (#24806)

Browse source
This commit is contained in:
Benjamin Peterson 2015-10-06 19:42:02 -07:00
commit 59dc696821
3 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/typeobject.c
View file

@ -1965,6 +1965,12 @@ best_base(PyObject *bases)
if (PyType_Ready(base_i) < 0)
return NULL;
}
if (!PyType_HasFeature(base_i, Py_TPFLAGS_BASETYPE)) {
PyErr_Format(PyExc_TypeError,
"type '%.100s' is not an acceptable base type",
base_i->tp_name);
return NULL;
}
candidate = solid_base(base_i);
if (winner == NULL) {
winner = candidate;
@ -2345,12 +2351,6 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
if (base == NULL) {
goto error;
}
if (!PyType_HasFeature(base, Py_TPFLAGS_BASETYPE)) {
PyErr_Format(PyExc_TypeError,
"type '%.100s' is not an acceptable base type",
base->tp_name);
goto error;
}
dict = PyDict_Copy(orig_dict);
if (dict == NULL)