Remove use of six.string_types

sebastinas · sebastinas · commit c829a8361793 · 2020-10-13T21:18:30.000+02:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -31,7 +31,7 @@
 import re
 import rlcompleter
 from six.moves import builtins
-from six import string_types, iteritems
+from six import iteritems
 
 from . import inspection
 from . import importcompletion
@@ -460,7 +460,7 @@ def matches(self, cursor_offset, line, **kwargs):
             matches = set(
                 name + "="
                 for name in argspec[1][0]
-                if isinstance(name, string_types) and name.startswith(r.word)
+                if isinstance(name, str) and name.startswith(r.word)
             )
             matches.update(
                 name + "="
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
@@ -30,7 +30,6 @@
 import ast
 import inspect
 import sys
-from six import string_types
 from six.moves import builtins
 
 from . import line as line_properties
@@ -82,7 +81,7 @@ def simple_eval(node_or_string, namespace=None):
     """
     if namespace is None:
         namespace = {}
-    if isinstance(node_or_string, string_types):
+    if isinstance(node_or_string, str):
         node_or_string = ast.parse(node_or_string, mode="eval")
     if isinstance(node_or_string, ast.Expression):
         node_or_string = node_or_string.body
@@ -179,7 +178,7 @@ def _convert(node):
 
 def safe_getitem(obj, index):
     """ Safely tries to access obj[index] """
-    if type(obj) in (list, tuple, dict, bytes) + string_types:
+    if type(obj) in (list, tuple, dict, bytes, str):
         try:
             return obj[index]
         except (KeyError, IndexError):
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -39,7 +39,7 @@
 import locale
 import signal
 from optparse import Option
-from six import iteritems, string_types
+from six import iteritems
 
 from pygments.token import Token
 
@@ -278,7 +278,7 @@ def decoding_input_filter(keys, raw):
     encoding = locale.getpreferredencoding()
     converted_keys = list()
     for key in keys:
-        if isinstance(key, string_types):
+        if isinstance(key, str):
             converted_keys.append(key.decode(encoding))
         else:
             converted_keys.append(key)
