diff options
| author | Raymond Hettinger <python@rcn.com> | 2009-07-27 20:32:04 +0000 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2009-07-27 20:32:04 +0000 |
| commit | c2b9e1a134bef289445d0779d26b6ccf36d03077 (patch) | |
| tree | 2d275d38c69c1e6140121e5d76c8e7aaa91f5c26 | |
| parent | 794b2a78d066f0d1c504fdab9a6e513a346d6e69 (diff) | |
| download | cpython-git-c2b9e1a134bef289445d0779d26b6ccf36d03077.tar.gz | |
Issue 6573: Fix set.union() for cases where self is in the argument chain.
| -rw-r--r-- | Lib/test/test_set.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/setobject.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 872e9ead98..bc7465a5ba 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -81,6 +81,10 @@ class TestJointOps(unittest.TestCase): self.assertEqual(self.thetype('abcba').union(C('ef')), set('abcef')) self.assertEqual(self.thetype('abcba').union(C('ef'), C('fg')), set('abcefg')) + # Issue #6573 + x = self.thetype() + self.assertEqual(x.union(set([1]), x, set([2])), self.thetype([1, 2])) + def test_or(self): i = self.s.union(self.otherword) self.assertEqual(self.s | set(self.otherword), i) @@ -14,6 +14,9 @@ Core and Builtins - Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. +- Issue #6573: set.union() stopped processing inputs if an instance of self + occurred in the argument chain. + - Issue #1616979: Added the cp720 (Arabic DOS) encoding. - Issue #6070: On posix platforms import no longer copies the execute bit diff --git a/Objects/setobject.c b/Objects/setobject.c index a55bbb70ad..dd45380a35 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; |