mirror of
https://github.com/python/cpython.git
synced 2025-11-02 03:01:58 +00:00
Close off the "Verre Carlo hack" as discussed on python-dev.
This commit is contained in:
parent
2fd02eb80f
commit
4dcdb78c6f
2 changed files with 39 additions and 0 deletions
|
|
@ -3574,6 +3574,24 @@ wrap_cmpfunc(PyObject *self, PyObject *args, void *wrapped)
|
|||
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 @@ wrap_setattr(PyObject *self, PyObject *args, void *wrapped)
|
|||
|
||||
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 @@ wrap_delattr(PyObject *self, PyObject *args, void *wrapped)
|
|||
|
||||
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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue