diff options
| author | Raymond Hettinger <python@rcn.com> | 2008-01-26 09:31:11 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2008-01-26 09:31:11 (GMT) |
| commit | dee3f65d986de6ac7ec1e4b5292ef18ec14fc9f7 (patch) | |
| tree | 0c2212d3e6fc887c270439f4359d396e3c8918b4 /Objects | |
| parent | d3757233659f85b5ddecb286341c34b75b711645 (diff) | |
| download | cpython-dee3f65d986de6ac7ec1e4b5292ef18ec14fc9f7.zip cpython-dee3f65d986de6ac7ec1e4b5292ef18ec14fc9f7.tar.gz cpython-dee3f65d986de6ac7ec1e4b5292ef18ec14fc9f7.tar.bz2 | |
Revert PySet_Add() changes.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/setobject.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c index 8a5f7cf..c8db7ce 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -2198,6 +2198,10 @@ PySet_Discard(PyObject *set, PyObject *key) int PySet_Add(PyObject *set, PyObject *key) { + if (!PyType_IsSubtype(Py_TYPE(set), &PySet_Type)) { + PyErr_BadInternalCall(); + return -1; + } return set_add_key((PySetObject *)set, key); } @@ -2341,6 +2345,7 @@ test_c_api(PySetObject *so) f = PyFrozenSet_New(dup); assert(PySet_Size(f) == 3); assert(PyFrozenSet_CheckExact(f)); + assertRaises(PySet_Add(f, elem) == -1, PyExc_SystemError); assertRaises(PySet_Discard(f, elem) == -1, PyExc_SystemError); assertRaises(PySet_Pop(f) == NULL, PyExc_SystemError); Py_DECREF(f); |