classobject.c moduleobject.c stdwinmodule.c xxobject.c:
raise AttributeError, not KeyError, when attribute deletion fails.
sunaudiodevmodule.c: check for deletion before calling setmember.
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index bbe927c..aedba35 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -132,11 +132,16 @@
object *v;
{
if (strcmp(name, "__dict__") == 0 || strcmp(name, "__name__") == 0) {
- err_setstr(TypeError, "can't assign to reserved member name");
+ err_setstr(TypeError, "read-only special attribute");
return -1;
}
- if (v == NULL)
- return dictremove(m->md_dict, name);
+ if (v == NULL) {
+ int rv = dictremove(m->md_dict, name);
+ if (rv < 0)
+ err_setstr(AttributeError,
+ "delete non-existing module attribute");
+ return rv;
+ }
else
return dictinsert(m->md_dict, name, v);
}