mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 19:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78505-78506 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78505 | benjamin.peterson | 2010-02-27 11:40:01 -0600 (Sat, 27 Feb 2010) | 1 line

  only accept AttributeError as indicating no __prepare__ attribute on a metaclass, allowing lookup errors to propogate
........
  r78506 | benjamin.peterson | 2010-02-27 11:41:13 -0600 (Sat, 27 Feb 2010) | 1 line

  check PyDict_New() for error
........
This commit is contained in:
Benjamin Peterson 2010-02-27 17:56:22 +00:00
parent b7f27ff9ac
commit 1ca73ede26
3 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_metaclass.py
View file

@ -230,6 +230,20 @@ Make sure it works with subclassing.
42 42
>>> >>>
Test failures in looking up the __prepare__ method work.
>>> class ObscureException(Exception):
... pass
>>> class FailDescr:
... def __get__(self, instance, owner):
... raise ObscureException
>>> class Meta(type):
... __prepare__ = FailDescr()
>>> class X(metaclass=Meta):
... pass
Traceback (most recent call last):
[...]
test.test_metaclass.ObscureException
""" """
__test__ = {'doctests' : doctests} __test__ = {'doctests' : doctests}

2
Misc/NEWS
View file

@ -12,6 +12,8 @@ What's New in Python 3.1.2?
Core and Builtins Core and Builtins
----------------- -----------------
- Handle errors from looking up __prepare__ correctly.
- Issue #5939: Add additional runtime checking to ensure a valid capsule - Issue #5939: Add additional runtime checking to ensure a valid capsule
in Modules/_ctypes/callproc.c. in Modules/_ctypes/callproc.c.

24
Python/bltinmodule.c
View file

@ -108,8 +108,16 @@ builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds)
} }
prep = PyObject_GetAttrString(meta, "__prepare__"); prep = PyObject_GetAttrString(meta, "__prepare__");
if (prep == NULL) { if (prep == NULL) {
PyErr_Clear(); if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
ns = PyDict_New(); PyErr_Clear();
ns = PyDict_New();
}
else {
Py_DECREF(meta);
Py_XDECREF(mkw);
Py_DECREF(bases);
return NULL;
}
} }
else { else {
PyObject *pargs = PyTuple_Pack(2, name, bases); PyObject *pargs = PyTuple_Pack(2, name, bases);
@ -123,12 +131,12 @@ builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds)
ns = PyEval_CallObjectWithKeywords(prep, pargs, mkw); ns = PyEval_CallObjectWithKeywords(prep, pargs, mkw);
Py_DECREF(pargs); Py_DECREF(pargs);
Py_DECREF(prep); Py_DECREF(prep);
if (ns == NULL) { }
Py_DECREF(meta); if (ns == NULL) {
Py_XDECREF(mkw); Py_DECREF(meta);
Py_DECREF(bases); Py_XDECREF(mkw);
return NULL; Py_DECREF(bases);
} return NULL;
} }
cell = PyObject_CallFunctionObjArgs(func, ns, NULL); cell = PyObject_CallFunctionObjArgs(func, ns, NULL);
if (cell != NULL) { if (cell != NULL) {