Use iter* from six

sebastinas · sebastinas · commit d513d3aba091 · 2015-02-04T19:04:58.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/config.py b/bpython/config.py
@@ -5,6 +5,8 @@
 import sys
 import locale
 from itertools import chain
+from six import iterkeys, iteritems
+
 from bpython.keys import cli_key_dispatch as key_dispatch
 from bpython.autocomplete import SIMPLE as default_completion
 import bpython.autocomplete
@@ -48,11 +50,11 @@ def default_config_path():
 
 
 def fill_config_with_default_values(config, default_values):
-    for section in default_values.iterkeys():
+    for section in iterkeys(default_values):
         if not config.has_section(section):
             config.add_section(section)
 
-        for (opt, val) in default_values[section].iteritems():
+        for (opt, val) in iteritems(default_values[section]):
             if not config.has_option(section, opt):
                 config.set(section, opt, str(val))
 
@@ -130,7 +132,7 @@ def loadini(struct, configfile):
         }}
 
     default_keys_to_commands = dict((value, key) for (key, value)
-                                    in defaults['keyboard'].iteritems())
+                                    in iteritems(defaults['keyboard']))
 
     fill_config_with_default_values(config, defaults)
     if not config.read(config_path):
@@ -307,6 +309,6 @@ def load_theme(struct, path, colors, default_colors):
             colors[k] = theme.get('interface', k)
 
     # Check against default theme to see if all values are defined
-    for k, v in default_colors.iteritems():
+    for k, v in iteritems(default_colors):
         if k not in colors:
             colors[k] = v
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -1,15 +1,17 @@
 import code
 import traceback
 import sys
+from codeop import CommandCompiler
+from six import iteritems
+
 from pygments.token import Generic, Token, Keyword, Name, Comment, String
 from pygments.token import Error, Literal, Number, Operator, Punctuation
 from pygments.token import Whitespace
 from pygments.formatter import Formatter
-from bpython.curtsiesfrontend.parse import parse
-from bpython.repl import RuntimeTimer
-from codeop import CommandCompiler
 from pygments.lexers import get_lexer_by_name
 
+from bpython.curtsiesfrontend.parse import parse
+from bpython.repl import RuntimeTimer
 
 default_colors = {
         Generic.Error:'R',
@@ -45,7 +47,7 @@ class BPythonFormatter(Formatter):
 
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
-        for k, v in color_scheme.iteritems():
+        for k, v in iteritems(color_scheme):
             self.f_strings[k] = '\x01%s' % (v,)
         Formatter.__init__(self, **options)
 
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -723,7 +723,7 @@ def send_current_block_to_external_editor(self, filename=None):
 
     def send_session_to_external_editor(self, filename=None):
         for_editor = u'### current bpython session - file will be reevaluated, ### lines will not be run\n'
-        for_editor += '\n'.join(line[len(self.ps1):] if line.startswith(self.ps1) else
+        for_editor += u'\n'.join(line[len(self.ps1):] if line.startswith(self.ps1) else
                                 (line[len(self.ps2):] if line.startswith(self.ps2) else
                                 '### '+line)
                                 for line in self.getstdout().split('\n'))
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -27,6 +27,7 @@
 from pygments.formatter import Formatter
 from pygments.token import Keyword, Name, Comment, String, Error, \
      Number, Operator, Token, Whitespace, Literal, Punctuation
+from six import iteritems
 
 """These format strings are pretty ugly.
 \x01 represents a colour marker, which
@@ -85,7 +86,7 @@ class BPythonFormatter(Formatter):
 
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
-        for k, v in theme_map.iteritems():
+        for k, v in iteritems(theme_map):
             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
@@ -40,6 +40,7 @@
 from itertools import takewhile
 from locale import getpreferredencoding
 from string import Template
+from six import itervalues
 
 from pygments.token import Token
 
@@ -958,7 +959,7 @@ def tokenize(self, s, newline=False):
                     else:
                         stack.append((line, len(line_tokens) - 1,
                                       line_tokens, value))
-                elif value in parens.itervalues():
+                elif value in itervalues(parens):
                     saved_stack = list(stack)
                     try:
                         while True:
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -43,6 +43,7 @@
 from types import ModuleType
 from optparse import Option
 from six.moves import range
+from six import iteritems
 
 from pygments.token import Token
 
@@ -1151,7 +1152,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.iteritems()]
+        for name, color in iteritems(config.color_scheme)]
     palette.extend([
             ('bold ' + name, color + ',bold', background, monochrome)
             for name, color, background, monochrome in palette])
