summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2009-07-27 20:32:04 (GMT)
committerRaymond Hettinger <python@rcn.com>2009-07-27 20:32:04 (GMT)
commitc2b9e1a134bef289445d0779d26b6ccf36d03077 (patch)
tree2d275d38c69c1e6140121e5d76c8e7aaa91f5c26 /Objects
parent794b2a78d066f0d1c504fdab9a6e513a346d6e69 (diff)
downloadcpython-c2b9e1a134bef289445d0779d26b6ccf36d03077.zip
cpython-c2b9e1a134bef289445d0779d26b6ccf36d03077.tar.gz
cpython-c2b9e1a134bef289445d0779d26b6ccf36d03077.tar.bz2
Issue 6573: Fix set.union() for cases where self is in the argument chain.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/setobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c
index a55bbb7..dd45380 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1183,7 +1183,7 @@ set_union(PySetObject *so, PyObject *args)
for (i=0 ; i<PyTuple_GET_SIZE(args) ; i++) {
other = PyTuple_GET_ITEM(args, i);
if ((PyObject *)so == other)
- return (PyObject *)result;
+ continue;
if (set_update_internal(result, other) == -1) {
Py_DECREF(result);
return NULL;