diff options
| author | Guido van Rossum <guido@python.org> | 2001-12-03 00:08:33 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-12-03 00:08:33 (GMT) |
| commit | 1d5b3f29ffc4a17f88f26c670c1e74290795e6f7 (patch) | |
| tree | c80f7d2149237f85a567caf3efb05b5996567936 | |
| parent | 55070f5d966f09256c603c3a82fab9b034430c6f (diff) | |
| download | cpython-1d5b3f29ffc4a17f88f26c670c1e74290795e6f7.zip cpython-1d5b3f29ffc4a17f88f26c670c1e74290795e6f7.tar.gz cpython-1d5b3f29ffc4a17f88f26c670c1e74290795e6f7.tar.bz2 | |
Fix for SF bug #485678.
slot_tp_descr_set(): When deleting an attribute described by a
descriptor implemented in Python, the descriptor's __del__ method is
called by the slot_tp_descr_set dispatch function. This is bogus --
__del__ already has a different meaning. Renaming this use of __del__
is renamed to __delete__.
| -rw-r--r-- | Objects/typeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 07032f4..c79636d 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3281,7 +3281,7 @@ slot_tp_descr_set(PyObject *self, PyObject *target, PyObject *value) static PyObject *del_str, *set_str; if (value == NULL) - res = call_method(self, "__del__", &del_str, + res = call_method(self, "__delete__", &del_str, "(O)", target); else res = call_method(self, "__set__", &set_str, |