[pypy-commit] pypy default: merge

[l.diekmann]

Author: l.diekmann
Branch: 
Changeset: r55718:75dcb8759f38
Date: 2012-06-19 18:20 +0200
http://bitbucket.org/pypy/pypy/changeset/75dcb8759f38/

Log:	merge

diff --git a/pypy/objspace/std/test/test_setobject.py b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -648,7 +648,14 @@
         c = a - b
         c.remove(2)
         assert c == set([1, 3])
-        assert a == set([1,2, 3])
+        assert a == set([1, 2, 3])
+
+        a = set([1,2,3])
+        b = set(["a", "b", "c"])
+        c = a - b
+        c.remove(2)
+        assert c == set([1, 3])
+        assert a == set([1, 2, 3])
 
     def test_intersection_update(self):
         s = set([1,2,3,4,7])