mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-21 09:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Bypass set specific optimizations for set and frozenset subclasses.

Browse source
This commit is contained in:
Raymond Hettinger 2007-02-08 00:49:51 +00:00
parent 9f0e1ea964
commit fdf7bf8305
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/setobject.c
View file

@ -912,7 +912,7 @@ set_update_internal(PySetObject *so, PyObject *other)
{ {
PyObject *key, *it; PyObject *key, *it;
if (PyAnySet_Check(other)) if (PyAnySet_CheckExact(other))
return set_merge(so, other); return set_merge(so, other);
if (PyDict_CheckExact(other)) { if (PyDict_CheckExact(other)) {
@ -1190,7 +1190,7 @@ set_intersection(PySetObject *so, PyObject *other)
if (result == NULL) if (result == NULL)
return NULL; return NULL;
if (PyAnySet_Check(other)) { if (PyAnySet_CheckExact(other)) {
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
setentry *entry; setentry *entry;
@ -1314,7 +1314,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
if ((PyObject *)so == other) if ((PyObject *)so == other)
return set_clear_internal(so); return set_clear_internal(so);
if (PyAnySet_Check(other)) { if (PyAnySet_CheckExact(other)) {
setentry *entry; setentry *entry;
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
@ -1363,7 +1363,7 @@ set_difference(PySetObject *so, PyObject *other)
setentry *entry; setentry *entry;
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) { if (!PyAnySet_CheckExact(other) && !PyDict_CheckExact(other)) {
result = set_copy(so); result = set_copy(so);
if (result == NULL) if (result == NULL)
return NULL; return NULL;
@ -1472,7 +1472,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
Py_RETURN_NONE; Py_RETURN_NONE;
} }
if (PyAnySet_Check(other)) { if (PyAnySet_CheckExact(other)) {
Py_INCREF(other); Py_INCREF(other);
otherset = (PySetObject *)other; otherset = (PySetObject *)other;
} else { } else {
@ -1555,7 +1555,7 @@ set_issubset(PySetObject *so, PyObject *other)
setentry *entry; setentry *entry;
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
if (!PyAnySet_Check(other)) { if (!PyAnySet_CheckExact(other)) {
PyObject *tmp, *result; PyObject *tmp, *result;
tmp = make_new_set(&PySet_Type, other); tmp = make_new_set(&PySet_Type, other);
if (tmp == NULL) if (tmp == NULL)
@ -1584,7 +1584,7 @@ set_issuperset(PySetObject *so, PyObject *other)
{ {
PyObject *tmp, *result; PyObject *tmp, *result;
if (!PyAnySet_Check(other)) { if (!PyAnySet_CheckExact(other)) {
tmp = make_new_set(&PySet_Type, other); tmp = make_new_set(&PySet_Type, other);
if (tmp == NULL) if (tmp == NULL)
return NULL; return NULL;