diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-12-30 19:41:48 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-12-30 19:41:48 +0000 |
| commit | 788864f4838dc2d79a2403755656e00fc698a5a2 (patch) | |
| tree | a160f75e7596d38608d34a7c586f02ec1ca855bb | |
| parent | 36d3da87d9792b1bdaef00e00901d7453ccf67a6 (diff) | |
| download | cpython-git-788864f4838dc2d79a2403755656e00fc698a5a2.tar.gz | |
Merged revisions 77157 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77157 | benjamin.peterson | 2009-12-30 13:34:10 -0600 (Wed, 30 Dec 2009) | 5 lines
check if the attribute is set before deleting it with T_OBJECT_EX (fixes #7604)
Also, add a note to the docs about the better behavior of T_OBJECT_EX as
compared to T_OBJECT.
........
| -rw-r--r-- | Doc/c-api/structures.rst | 5 | ||||
| -rw-r--r-- | Lib/test/test_descr.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/structmember.c | 20 |
4 files changed, 27 insertions, 6 deletions
diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst index c4fb218749..c2847e8c95 100644 --- a/Doc/c-api/structures.rst +++ b/Doc/c-api/structures.rst @@ -281,7 +281,10 @@ definition with the same method name. :cmacro:`T_OBJECT` and :cmacro:`T_OBJECT_EX` differ in that :cmacro:`T_OBJECT` returns ``None`` if the member is *NULL* and - :cmacro:`T_OBJECT_EX` raises an :exc:`AttributeError`. + :cmacro:`T_OBJECT_EX` raises an :exc:`AttributeError`. Try to use + :cmacro:`T_OBJECT_EX` over :cmacro:`T_OBJECT` because :cmacro:`T_OBJECT_EX` + handles use of the :stmt:`del` statement on that attribute more correctly + than :cmacro:`T_OBJECT`. :attr:`flags` can be 0 for write and read access or :cmacro:`READONLY` for read-only access. Using :cmacro:`T_STRING` for :attr:`type` implies diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 3616642a2f..67e58ca157 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1142,6 +1142,11 @@ order (MRO) for bases """ del h self.assertEqual(s.getvalue(), '') + class X(object): + __slots__ = "a" + with self.assertRaises(AttributeError): + del X().a + def test_slots_special(self): # Testing __dict__ and __weakref__ in __slots__... class D(object): @@ -12,6 +12,9 @@ What's New in Python 2.6.5 Core and Builtins ----------------- +- Issue #7604: Deleting an unset slotted attribute did not raise an + AttributeError. + - Issue #7413: Passing '\0' as the separator to datetime.datetime.isoformat() used to drop the time part of the result. diff --git a/Python/structmember.c b/Python/structmember.c index d230590330..9f87c076e3 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -170,6 +170,8 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) { PyObject *oldv; + addr += l->offset; + if ((l->flags & READONLY) || l->type == T_STRING) { PyErr_SetString(PyExc_TypeError, "readonly attribute"); @@ -179,12 +181,20 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) PyErr_SetString(PyExc_RuntimeError, "restricted attribute"); return -1; } - if (v == NULL && l->type != T_OBJECT_EX && l->type != T_OBJECT) { - PyErr_SetString(PyExc_TypeError, - "can't delete numeric/char attribute"); - return -1; + if (v == NULL) { + if (l->type == T_OBJECT_EX) { + /* Check if the attribute is set. */ + if (*(PyObject **)addr == NULL) { + PyErr_SetString(PyExc_AttributeError, l->name); + return -1; + } + } + else if (l->type != T_OBJECT) { + PyErr_SetString(PyExc_TypeError, + "can't delete numeric/char attribute"); + return -1; + } } - addr += l->offset; switch (l->type) { case T_BOOL:{ if (!PyBool_Check(v)) { |