diff options
| author | Raymond Hettinger <python@rcn.com> | 2008-05-08 16:02:10 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2008-05-08 16:02:10 (GMT) |
| commit | 10956eab9ee96468c52f93d90b98e25619841969 (patch) | |
| tree | 4d9f3fa48f8e67bacfa21a13e6e1428b52470139 /Objects | |
| parent | 519a658c99d8f668efcb2b0e0a950f52188c9387 (diff) | |
| download | cpython-10956eab9ee96468c52f93d90b98e25619841969.zip cpython-10956eab9ee96468c52f93d90b98e25619841969.tar.gz cpython-10956eab9ee96468c52f93d90b98e25619841969.tar.bz2 | |
Forward port r62848.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/setobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c index fcc152a..2fd03af 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -1743,7 +1743,7 @@ set_contains(PySetObject *so, PyObject *key) rv = set_contains_key(so, key); if (rv == -1) { - if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) + if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) return -1; PyErr_Clear(); tmpkey = make_new_set(&PyFrozenSet_Type, NULL); @@ -1778,7 +1778,7 @@ set_remove(PySetObject *so, PyObject *key) rv = set_discard_key(so, key); if (rv == -1) { - if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) + if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) return NULL; PyErr_Clear(); tmpkey = make_new_set(&PyFrozenSet_Type, NULL); @@ -1809,7 +1809,7 @@ set_discard(PySetObject *so, PyObject *key) rv = set_discard_key(so, key); if (rv == -1) { - if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) + if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) return NULL; PyErr_Clear(); tmpkey = make_new_set(&PyFrozenSet_Type, NULL); |