summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-30 19:44:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-30 19:44:54 (GMT)
commitd12362a828a57bc8eff8f0efe85aad7672cc9b85 (patch)
tree0356c975064b6350efcf62be39b8045cb7ca8085 /Python
parent9abe1f1159079445e88cd13d45d5fcc432bb8ce5 (diff)
downloadcpython-d12362a828a57bc8eff8f0efe85aad7672cc9b85.zip
cpython-d12362a828a57bc8eff8f0efe85aad7672cc9b85.tar.gz
cpython-d12362a828a57bc8eff8f0efe85aad7672cc9b85.tar.bz2
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. ........
Diffstat (limited to 'Python')
-rw-r--r--Python/structmember.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/Python/structmember.c b/Python/structmember.c
index 9f08a6b..8edc354 100644
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -104,17 +104,27 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
{
PyObject *oldv;
+ addr += l->offset;
+
if ((l->flags & READONLY) || l->type == T_STRING)
{
PyErr_SetString(PyExc_AttributeError, "readonly 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)) {