Close off the "Verre Carlo hack" as discussed on python-dev.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index a900f55..91c40b9 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3574,6 +3574,24 @@
return PyInt_FromLong((long)res);
}
+/* Helper to check for object.__setattr__ or __delattr__ applied to a type.
+ This is called the Verre Carlo hack after its discoverer. */
+static int
+hackcheck(PyObject *self, setattrofunc func, char *what)
+{
+ PyTypeObject *type = self->ob_type;
+ while (type && type->tp_flags & Py_TPFLAGS_HEAPTYPE)
+ type = type->tp_base;
+ if (type->tp_setattro != func) {
+ PyErr_Format(PyExc_TypeError,
+ "can't apply this %s to %s object",
+ what,
+ type->tp_name);
+ return 0;
+ }
+ return 1;
+}
+
static PyObject *
wrap_setattr(PyObject *self, PyObject *args, void *wrapped)
{
@@ -3583,6 +3601,8 @@
if (!PyArg_ParseTuple(args, "OO", &name, &value))
return NULL;
+ if (!hackcheck(self, func, "__setattr__"))
+ return NULL;
res = (*func)(self, name, value);
if (res < 0)
return NULL;
@@ -3599,6 +3619,8 @@
if (!PyArg_ParseTuple(args, "O", &name))
return NULL;
+ if (!hackcheck(self, func, "__delattr__"))
+ return NULL;
res = (*func)(self, name, NULL);
if (res < 0)
return NULL;