merge 0.19.x branch into master

ee659389 · Stefan Behnel · 34a1c3a0 · 15c349ec · ee659389
Commit ee659389 authored Nov 01, 2013 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Cython/Utility/ObjectHandling.c Cython/Utility/ObjectHandling.c +3 -1

No files found.
--- a/Cython/Utility/ObjectHandling.c
+++ b/Cython/Utility/ObjectHandling.c
@@ -677,9 +677,11 @@ static PyObject *__Pyx_FindPy2Metaclass(PyObject *bases) {
        if (!metaclass) {
            PyErr_Clear();
            metaclass = (PyObject*) Py_TYPE(base);
+            Py_INCREF(metaclass);
        }
    } else {
        metaclass = (PyObject *) &PyClass_Type;
+        Py_INCREF(metaclass);
    }
 #else
    if (PyTuple_Check(bases) && PyTuple_GET_SIZE(bases) > 0) {
@@ -688,8 +690,8 @@ static PyObject *__Pyx_FindPy2Metaclass(PyObject *bases) {
    } else {
        metaclass = (PyObject *) &PyType_Type;
    }
-#endif
    Py_INCREF(metaclass);
+#endif
    return metaclass;
 }