diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-10-07 02:42:02 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-10-07 02:42:02 (GMT) |
| commit | 59dc696821da8888b5ac1b86c6c0fd4202f92b39 (patch) | |
| tree | 99f4e3de908252de56f29239b99b9de954cc40fc /Objects | |
| parent | 479ac6654c94ee16fe2bfa2acec8d3fe86ef1381 (diff) | |
| parent | bd6c41a185ad4a2db9ad693a79496429e2f8d7ee (diff) | |
| download | cpython-59dc696821da8888b5ac1b86c6c0fd4202f92b39.zip cpython-59dc696821da8888b5ac1b86c6c0fd4202f92b39.tar.gz cpython-59dc696821da8888b5ac1b86c6c0fd4202f92b39.tar.bz2 | |
merge 3.4 (#24806)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index bb83530..06ce899 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -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) |