traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #1648179: set.update() not recognizing __iter__ overrides in dict subclasses.

This commit is contained in:
Raymond Hettinger 2007-02-01 21:01:21 +00:00
parent cd7a78e0a4
commit 21191f4f0c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -16,6 +16,9 @@ Core and builtins
a weakref on itself during a __del__ call for new-style classes (classic
classes still have the bug).
- Bug #1648179: set.update() did not recognize an overridden __iter__
method in subclasses of dict.
- Bug #1579370: Make PyTraceBack_Here use the current thread, not the
frame's thread state.

8
Objects/setobject.c
View File

@ -915,7 +915,7 @@ set_update_internal(PySetObject *so, PyObject *other)
if (PyAnySet_Check(other))
return set_merge(so, other);
if (PyDict_Check(other)) {
if (PyDict_CheckExact(other)) {
PyObject *value;
Py_ssize_t pos = 0;
while (PyDict_Next(other, &pos, &key, &value)) {
@ -1363,7 +1363,7 @@ set_difference(PySetObject *so, PyObject *other)
setentry *entry;
Py_ssize_t pos = 0;
if (!PyAnySet_Check(other) && !PyDict_Check(other)) {
if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) {
result = set_copy(so);
if (result == NULL)
return NULL;
@ -1377,7 +1377,7 @@ set_difference(PySetObject *so, PyObject *other)
if (result == NULL)
return NULL;
if (PyDict_Check(other)) {
if (PyDict_CheckExact(other)) {
while (set_next(so, &pos, &entry)) {
setentry entrycopy;
entrycopy.hash = entry->hash;
@ -1450,7 +1450,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
if ((PyObject *)so == other)
return set_clear(so);
if (PyDict_Check(other)) {
if (PyDict_CheckExact(other)) {
PyObject *value;
int rv;
while (PyDict_Next(other, &pos, &key, &value)) {