diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2011-10-23 22:04:16 +1000 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2011-10-23 22:04:16 +1000 |
| commit | 8a6fce2f337b3c623ee3091878fdd06bccc5b3fe (patch) | |
| tree | 13219bf0a84e6cacf39043e08b42f429b2d72579 /Include | |
| parent | a5459c6dc5806ddba5199b143ba4a240c33b27c8 (diff) | |
| download | cpython-8a6fce2f337b3c623ee3091878fdd06bccc5b3fe.tar.gz | |
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 3753785966..2528841d52 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 *); |