Fix: replace dict.iteritems regardless of context.

Author: martindemello

libmodernize/fixes/fix_dict_six.py

@@ -30,11 +30,9 @@ def transform_iter(self, node, results):
         assert method_name[4:] in (u'keys', u'items', u'values'), repr(method)
         head = [n.clone() for n in head]
         tail = [n.clone() for n in tail]
-        special = not tail and self.in_special_context(node, isiter)
         new = pytree.Node(syms.power, head)
-        if not special:
-            new.prefix = u''
-            new = fixer_util.Call(name, [new])
+        new.prefix = u''
+        new = fixer_util.Call(name, [new])
         if tail:
             new = pytree.Node(syms.power, [new] + tail)
         new.prefix = node.prefix

tests/test_fix_dict_six.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from utils import check_on_input
+from libmodernize.tests.utils import check_on_input
 
 
 TYPES = 'keys', 'items', 'values'
@@ -35,6 +35,16 @@
     pass
 """)
 
+DICT_ITER_IN_LOOP = ("""\
+for k in x.iter{type}():
+    pass
+""", """\
+from __future__ import absolute_import
+import six
+for k in six.iter{type}(x):
+    pass
+""")
+
 CHAINED_CALLS = ("""\
 (x + y).foo().iter{type}().bar()
 """, """\
@@ -60,5 +70,8 @@ def test_dict_plain():
 def test_dict_in_loop():
     check_on_input(*DICT_IN_LOOP)
 
+def test_dict_iter_in_loop():
+    check_all_types(*DICT_ITER_IN_LOOP)
+
 def test_chained_calls():
     check_all_types(*CHAINED_CALLS)