Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.c @ 59188:81d6833c6278
only accept AttributeError as indicating no __prepare__ attribute on a metaclass, allowing lookup errors to propogate
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Sat, 27 Feb 2010 17:40:01 +0000 |
| parents | a08840ce88d3 |
| children | 88f147d26372 |
line wrap: on
line diff
--- a/Python/bltinmodule.c Sat Feb 27 16:12:22 2010 +0000 +++ b/Python/bltinmodule.c Sat Feb 27 17:40:01 2010 +0000 @@ -108,8 +108,16 @@ } prep = PyObject_GetAttrString(meta, "__prepare__"); if (prep == NULL) { - PyErr_Clear(); - ns = PyDict_New(); + if (PyErr_ExceptionMatches(PyExc_AttributeError)) { + PyErr_Clear(); + ns = PyDict_New(); + } + else { + Py_DECREF(meta); + Py_XDECREF(mkw); + Py_DECREF(bases); + return NULL; + } } else { PyObject *pargs = PyTuple_Pack(2, name, bases);