classobject.c moduleobject.c stdwinmodule.c xxobject.c:

raise AttributeError, not KeyError, when attribute deletion fails.
sunaudiodevmodule.c: check for deletion before calling setmember.

Modules/stdwinmodule.c

@@ -1051,8 +1051,13 @@ text_setattr(tp, name, v)
 		if (tp->t_attr == NULL)
 			return -1;
 	}
-	if (v == NULL)
-		return dictremove(tp->t_attr, name);
+	if (v == NULL) {
+		int rv = dictremove(tp->t_attr, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+			        "delete non-existing text object attribute");
+		return rv;
+	}
 	else
 		return dictinsert(tp->t_attr, name, v);
 }
@@ -1253,8 +1258,13 @@ menu_setattr(mp, name, v)
 		if (mp->m_attr == NULL)
 			return -1;
 	}
-	if (v == NULL)
-		return dictremove(mp->m_attr, name);
+	if (v == NULL) {
+		int rv = dictremove(mp->m_attr, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+			        "delete non-existing menu object attribute");
+		return rv;
+	}
 	else
 		return dictinsert(mp->m_attr, name, v);
 }
@@ -1655,8 +1665,13 @@ window_setattr(wp, name, v)
 		if (wp->w_attr == NULL)
 			return -1;
 	}
-	if (v == NULL)
-		return dictremove(wp->w_attr, name);
+	if (v == NULL) {
+		int rv = dictremove(wp->w_attr, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+			        "delete non-existing menu object attribute");
+		return rv;
+	}
 	else
 		return dictinsert(wp->w_attr, name, v);
 }

Modules/sunaudiodev.c

@@ -343,6 +343,12 @@ sads_setattr(xp, name, v)
     char *name;
     object *v;
 {
+
+	if (v == NULL) {
+		err_setstr(TypeError,
+			   "can't delete sun audio status attributes");
+		return NULL;
+	}
 	return setmember((char *)&xp->ai, sads_ml, name, v);
 }
 

Objects/classobject.c

@@ -133,8 +133,13 @@ class_setattr(op, name, v)
 			return -1;
 		}
 	}
-	if (v == NULL)
-		return dictremove(op->cl_methods, name);
+	if (v == NULL) {
+		int rv = dictremove(op->cl_methods, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+				   "delete non-existing class attribute");
+		return rv;
+	}
 	else
 		return dictinsert(op->cl_methods, name, v);
 }
@@ -245,8 +250,13 @@ instance_setattr(inst, name, v)
 			return -1;
 		}
 	}
-	if (v == NULL)
-		return dictremove(inst->in_attr, name);
+	if (v == NULL) {
+		int rv = dictremove(inst->in_attr, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+				   "delete non-existing instance attribute");
+		return rv;
+	}
 	else
 		return dictinsert(inst->in_attr, name, v);
 }

Objects/moduleobject.c

@@ -132,11 +132,16 @@ module_setattr(m, name, v)
 	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);
 }

Objects/xxobject.c

@@ -110,8 +110,13 @@ xx_setattr(xp, name, v)
 		if (xp->x_attr == NULL)
 			return -1;
 	}
-	if (v == NULL)
-		return dictremove(xp->x_attr, name);
+	if (v == NULL) {
+		int rv = dictremove(xp->x_attr, name);
+		if (rv < 0)
+			err_setstr(AttributeError,
+			        "delete non-existing xx attribute");
+		return rv;
+	}
 	else
 		return dictinsert(xp->x_attr, name, v);
 }