[pypy-commit] pypy py3k: kill

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r64297:1f020dbe6b02
Date: 2013-05-18 16:34 -0700
http://bitbucket.org/pypy/pypy/changeset/1f020dbe6b02/

Log:	kill

diff --git a/pypy/module/_collections/app_defaultdict.py b/pypy/module/_collections/app_defaultdict.py
--- a/pypy/module/_collections/app_defaultdict.py
+++ b/pypy/module/_collections/app_defaultdict.py
@@ -63,4 +63,4 @@
 
            This API is used by pickle.py and copy.py.
         """
-        return (type(self), (self._default_factory,), None, None, self.iteritems())
+        return (type(self), (self._default_factory,), None, None, self.items())
diff --git a/pypy/module/_rawffi/test/test__rawffi.py b/pypy/module/_rawffi/test/test__rawffi.py
--- a/pypy/module/_rawffi/test/test__rawffi.py
+++ b/pypy/module/_rawffi/test/test__rawffi.py
@@ -679,7 +679,7 @@
 
     def test_sizes_and_alignments(self):
         import _rawffi
-        for k, (s, a) in self.sizes_and_alignments.iteritems():
+        for k, (s, a) in self.sizes_and_alignments.items():
             assert _rawffi.sizeof(k) == s
             assert _rawffi.alignment(k) == a
 
diff --git a/pypy/module/cpyext/dictobject.py b/pypy/module/cpyext/dictobject.py
--- a/pypy/module/cpyext/dictobject.py
+++ b/pypy/module/cpyext/dictobject.py
@@ -175,7 +175,7 @@
     # not complete.
 
     try:
-        w_iter = space.call_method(w_dict, "iteritems")
+        w_iter = space.call_method(w_dict, "items")
         pos = ppos[0]
         while pos:
             space.next(w_iter)
diff --git a/pypy/module/errno/test/test_errno.py b/pypy/module/errno/test/test_errno.py
--- a/pypy/module/errno/test/test_errno.py
+++ b/pypy/module/errno/test/test_errno.py
@@ -11,7 +11,7 @@
         assert self.errno.__file__
 
     def test_constants(self):
-        for code, name in self.errorcode.iteritems():
+        for code, name in self.errorcode.items():
             assert getattr(self.errno, name) == code
 
     def test_errorcode(self):
diff --git a/pypy/objspace/std/test/test_kwargsdict.py b/pypy/objspace/std/test/test_kwargsdict.py
--- a/pypy/objspace/std/test/test_kwargsdict.py
+++ b/pypy/objspace/std/test/test_kwargsdict.py
@@ -146,7 +146,7 @@
             return args
 
         assert dict.fromkeys(f(a=2, b=3)) == {"a": None, "b": None}
-        assert sorted(f(a=2, b=3).itervalues()) == [2, 3]
+        assert sorted(f(a=2, b=3).values()) == [2, 3]
 
     def test_setdefault(self):
         py3k_skip("XXX: strategies are currently broken")
diff --git a/pypy/objspace/std/test/test_lengthhint.py b/pypy/objspace/std/test/test_lengthhint.py
--- a/pypy/objspace/std/test/test_lengthhint.py
+++ b/pypy/objspace/std/test/test_lengthhint.py
@@ -41,7 +41,7 @@
         space = self.space
         w_iterkeys, w_mutate = space.fixedview(space.appexec([], """():
             d = dict.fromkeys(%r)
-            return d.iterkeys(), d.popitem
+            return d.keys(), d.popitem
         """ % self.ITEMS), 2)
         self._test_length_hint(w_iterkeys, w_mutate)
 
@@ -49,7 +49,7 @@
         space = self.space
         w_itervalues, w_mutate = space.fixedview(space.appexec([], """():
             d = dict.fromkeys(%r)
-            return d.itervalues(), d.popitem
+            return d.values(), d.popitem
         """ % self.ITEMS), 2)
         self._test_length_hint(w_itervalues, w_mutate)
 
diff --git a/pypy/objspace/std/unicodetype.py b/pypy/objspace/std/unicodetype.py
--- a/pypy/objspace/std/unicodetype.py
+++ b/pypy/objspace/std/unicodetype.py
@@ -348,7 +348,7 @@
                     "if you give only one argument "
                     "to maketrans it must be a dict"))
         # copy entries into the new dict, converting string keys to int keys
-        w_iter = space.call_method(w_x, "iteritems")
+        w_iter = space.call_method(w_x, "items")
         while True:
             try:
                 w_item = space.next(w_iter)