diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2011-10-23 12:04:16 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2011-10-23 12:04:16 (GMT) |
| commit | de31b191e570d00ed7917c7f9ea28af3e770c16d (patch) | |
| tree | 1139df0a3f75762d2acc5e6a5d964f62893fd68c /Include | |
| parent | 711f87ca7d8b455feb450b2fb66a3d264fd603ce (diff) | |
| download | cpython-de31b191e570d00ed7917c7f9ea28af3e770c16d.zip cpython-de31b191e570d00ed7917c7f9ea28af3e770c16d.tar.gz cpython-de31b191e570d00ed7917c7f9ea28af3e770c16d.tar.bz2 | |
Issue 1294232: Fix errors in metaclass calculation affecting some cases of metaclass inheritance. Patch by Daniel Urban.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/object.h b/Include/object.h index 3753785..2528841 100644 --- a/Include/object.h +++ b/Include/object.h @@ -449,6 +449,7 @@ PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *, #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **); +PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *); #endif PyAPI_FUNC(unsigned int) PyType_ClearCache(void); PyAPI_FUNC(void) PyType_Modified(PyTypeObject *); |