Revert "Use methods without iter"

sebastinas · sebastinas · commit 706485835fbc · 2015-02-04T18:59:21.000+01:00
This reverts commit 1ef719c.
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -45,7 +45,7 @@ class BPythonFormatter(Formatter):
 
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
-        for k, v in color_scheme.items():
+        for k, v in color_scheme.iteritems():
             self.f_strings[k] = '\x01%s' % (v,)
         Formatter.__init__(self, **options)
 
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -85,7 +85,7 @@ class BPythonFormatter(Formatter):
 
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
-        for k, v in theme_map.items():
+        for k, v in theme_map.iteritems():
             self.f_strings[k] = '\x01%s' % (color_scheme[v],)
             if k is Parenthesis:
                 # FIXME: Find a way to make this the inverse of the current
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -958,7 +958,7 @@ def tokenize(self, s, newline=False):
                     else:
                         stack.append((line, len(line_tokens) - 1,
                                       line_tokens, value))
-                elif value in parens.values():
+                elif value in parens.itervalues():
                     saved_stack = list(stack)
                     try:
                         while True:
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1151,7 +1151,7 @@ def main(args=None, locals_=None, banner=None):
     palette = [
         (name, COLORMAP[color.lower()], 'default',
          'bold' if color.isupper() else 'default')
-        for name, color in config.color_scheme.items()]
+        for name, color in config.color_scheme.iteritems()]
     palette.extend([
             ('bold ' + name, color + ',bold', background, monochrome)
             for name, color, background, monochrome in palette])
