Remove use of six.iteritems

sebastinas · sebastinas · commit 5a42d0a14755 · 2020-10-13T21:18:30.000+02:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -30,7 +30,6 @@
 import os
 import re
 import rlcompleter
-from six import iteritems
 import builtins
 
 from . import inspection
@@ -430,7 +429,7 @@ def matches(self, cursor_offset, line, **kwargs):
             if self.method_match(word, n, r.word):
                 matches.add(word)
         for nspace in (builtins.__dict__, locals_):
-            for word, val in iteritems(nspace):
+            for word, val in nspace.items():
                 # if identifier isn't ascii, don't complete (syntax error)
                 if word is None:
                     continue
diff --git a/bpython/config.py b/bpython/config.py
@@ -2,7 +2,7 @@
 import sys
 import locale
 from itertools import chain
-from six import iterkeys, iteritems
+from six import iterkeys
 from configparser import ConfigParser
 
 from .autocomplete import SIMPLE as default_completion, ALL_MODES
@@ -47,7 +47,7 @@ def fill_config_with_default_values(config, default_values):
         if not config.has_section(section):
             config.add_section(section)
 
-        for (opt, val) in iteritems(default_values[section]):
+        for (opt, val) in default_values[section].items():
             if not config.has_option(section, opt):
                 config.set(section, opt, "%s" % (val,))
 
@@ -122,9 +122,9 @@ def loadini(struct, configfile):
         "curtsies": {"list_above": False, "right_arrow_completion": True,},
     }
 
-    default_keys_to_commands = dict(
-        (value, key) for (key, value) in iteritems(defaults["keyboard"])
-    )
+    default_keys_to_commands = {
+        value: key for (key, value) in defaults["keyboard"].items()
+    }
 
     fill_config_with_default_values(config, defaults)
     try:
@@ -314,6 +314,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 iteritems(default_colors):
+    for k, v in default_colors.items():
         if k not in colors:
             colors[k] = v
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -1,5 +1,5 @@
 import sys
-from six import iteritems, text_type
+from six import text_type
 
 from pygments.token import Generic, Token, Keyword, Name, Comment, String
 from pygments.token import Error, Literal, Number, Operator, Punctuation
@@ -45,7 +45,7 @@ class BPythonFormatter(Formatter):
 
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
-        for k, v in iteritems(color_scheme):
+        for k, v in color_scheme.items():
             self.f_strings[k] = "\x01%s" % (v,)
         super().__init__(**options)
 
diff --git a/bpython/curtsiesfrontend/manual_readline.py b/bpython/curtsiesfrontend/manual_readline.py
@@ -7,7 +7,6 @@
 from bpython.lazyre import LazyReCompile
 
 import inspect
-from six import iteritems
 
 INDENT = 4
 
@@ -38,9 +37,9 @@ def add(self, key, func, overwrite=False):
             else:
                 raise ValueError("key %r already has a mapping" % (key,))
         params = getargspec(func)
-        args = dict(
-            (k, v) for k, v in iteritems(self.default_kwargs) if k in params
-        )
+        args = {
+            k: v for k, v in self.default_kwargs.items() if k in params
+        }
         r = func(**args)
         if len(r) == 2:
             if hasattr(func, "kills"):
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -39,7 +39,6 @@
     Literal,
     Punctuation,
 )
-from six import iteritems
 
 """These format strings are pretty ugly.
 \x01 represents a colour marker, which
@@ -99,7 +98,7 @@ class BPythonFormatter(Formatter):
 
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
-        for k, v in iteritems(theme_map):
+        for k, v in theme_map.items():
             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/urwid.py b/bpython/urwid.py
@@ -38,7 +38,6 @@
 import locale
 import signal
 from optparse import Option
-from six import iteritems
 
 from pygments.token import Token
 
@@ -1188,7 +1187,7 @@ def main(args=None, locals_=None, banner=None):
             "default",
             "bold" if color.isupper() else "default",
         )
-        for name, color in iteritems(config.color_scheme)
+        for name, color in config.color_scheme.items()
     ]
     palette.extend(
         [

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@`
`38`	`38`	`import locale`
`39`	`39`	`import signal`
`40`	`40`	`from optparse import Option`
`41`		`-from six import iteritems`
`42`	`41`
`43`	`42`	`from pygments.token import Token`
`44`	`43`
`@@ -1188,7 +1187,7 @@ def main(args=None, locals_=None, banner=None):`
`1188`	`1187`	`"default",`
`1189`	`1188`	`"bold" if color.isupper() else "default",`
`1190`	`1189`	`)`
`1191`		`- for name, color in iteritems(config.color_scheme)`
	`1190`	`+ for name, color in config.color_scheme.items()`
`1192`	`1191`	`]`
`1193`	`1192`	`palette.extend(`
`1194`	`1193`	`[`