[Python-3000-checkins] r62871 - python/branches/py3k/Objects/setobject.c
raymond.hettinger
python-3000-checkins at python.org
Thu May 8 18:02:11 CEST 2008
Author: raymond.hettinger
Date: Thu May 8 18:02:10 2008
New Revision: 62871
Log:
Forward port r62848.
Modified:
python/branches/py3k/Objects/setobject.c
Modified: python/branches/py3k/Objects/setobject.c
==============================================================================
--- python/branches/py3k/Objects/setobject.c (original)
+++ python/branches/py3k/Objects/setobject.c Thu May 8 18:02:10 2008
@@ -1743,7 +1743,7 @@
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 @@
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 @@
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);
More information about the Python-3000-checkins
mailing list