From 23e018ab9893369e7669631af16016b83b0de09b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 27 Feb 2010 17:40:01 +0000 Subject: only accept AttributeError as indicating no __prepare__ attribute on a metaclass, allowing lookup errors to propogate --- Python/bltinmodule.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'Python/bltinmodule.c') diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 7fe164f5de..5c7138ec60 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -108,8 +108,16 @@ builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds) } 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); -- cgit v1.2.1