[pypy-commit] pypy py3k: 2to3

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r65178:5d231843e448
Date: 2013-07-03 13:14 -0700
http://bitbucket.org/pypy/pypy/changeset/5d231843e448/

Log:	2to3

diff --git a/pypy/objspace/std/test/test_identityset.py b/pypy/objspace/std/test/test_identityset.py
--- a/pypy/objspace/std/test/test_identityset.py
+++ b/pypy/objspace/std/test/test_identityset.py
@@ -53,7 +53,7 @@
 
         assert self.uses_strategy('IdentitySetStrategy',set([X(),X()]))
         assert not self.uses_strategy('IdentitySetStrategy',set([X(),""]))
-        assert not self.uses_strategy('IdentitySetStrategy',set([X(),u""]))
+        assert not self.uses_strategy('IdentitySetStrategy',set([X(),""]))
         assert not self.uses_strategy('IdentitySetStrategy',set([X(),1]))
 
     def test_identity_strategy_add(self):
@@ -125,11 +125,11 @@
         assert s.intersection(set(['a','b','c'])) == set()
         assert s.intersection(set([X(),X()])) == set()
 
-        other = set(['a','b','c',s.__iter__().next()])
+        other = set(['a','b','c',next(s.__iter__())])
         intersect = s.intersection(other)
         assert len(intersect) == 1
-        assert intersect.__iter__().next() in s
-        assert intersect.__iter__().next() in other
+        assert next(intersect.__iter__()) in s
+        assert next(intersect.__iter__()) in other
 
     def test_class_monkey_patch(self):
 
@@ -145,7 +145,7 @@
         assert not self.uses_strategy('IdentitySetStrategy',s)
         assert not self.uses_strategy('IdentitySetStrategy',set([X(),X()]))
         assert not self.uses_strategy('IdentitySetStrategy',set([X(),""]))
-        assert not self.uses_strategy('IdentitySetStrategy',set([X(),u""]))
+        assert not self.uses_strategy('IdentitySetStrategy',set([X(),""]))
         assert not self.uses_strategy('IdentitySetStrategy',set([X(),1]))
 
         # An interesting case, add an instance, mutate the class,
@@ -161,7 +161,7 @@
         s.add(inst)
 
         assert len(s) == 1
-        assert s.__iter__().next() is inst
+        assert next(s.__iter__()) is inst
         assert not self.uses_strategy('IdentitySetStrategy',s)