From: Raymond Hettinger <python@rcn.com>
Date: Thu, 8 May 2008 04:35:20 +0000 (+0000)
Subject: Frozensets do not benefit from autoconversion.
X-Git-Tag: v2.6a3~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5a1cc5c37795cf243e1ba83cfa3cb39ec62a61c;p=thirdparty%2FPython%2Fcpython.git

Frozensets do not benefit from autoconversion.
---

diff --git a/Objects/setobject.c b/Objects/setobject.c
index cc2c2ee86819..b379845d7a97 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1755,7 +1755,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);
@@ -1790,7 +1790,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);
@@ -1821,7 +1821,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);