Remove bpython._py3compat.try_decode

sebastinas · sebastinas · commit 1ef1776711ad · 2020-10-13T21:18:29.000+02:00
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -34,21 +34,3 @@
 import sys
 
 py3 = sys.version_info[0] == 3
-
-
-if py3:
-
-    def try_decode(s, encoding):
-        return s
-
-
-else:
-
-    def try_decode(s, encoding):
-        """Try to decode s which is str names. Return None if not decodable"""
-        if not isinstance(s, unicode):
-            try:
-                return s.decode(encoding)
-            except UnicodeDecodeError:
-                return None
-        return s
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -37,7 +37,7 @@
 from . import importcompletion
 from . import line as lineparts
 from .line import LinePart
-from ._py3compat import py3, try_decode
+from ._py3compat import py3
 from .lazyre import LazyReCompile
 from .simpleeval import safe_eval, evaluate_current_expression, EvaluationError
 
@@ -470,7 +470,6 @@ def matches(self, cursor_offset, line, **kwargs):
                 matches.add(word)
         for nspace in (builtins.__dict__, locals_):
             for word, val in iteritems(nspace):
-                word = try_decode(word, "ascii")
                 # if identifier isn't ascii, don't complete (syntax error)
                 if word is None:
                     continue
@@ -580,7 +579,7 @@ def matches(self, cursor_offset, line, **kwargs):
 
             first_letter = line[self._orig_start : self._orig_start + 1]
 
-            matches = [try_decode(c.name, "ascii") for c in completions]
+            matches = [c.name for c in completions]
             if any(
                 not m.lower().startswith(matches[0][0].lower()) for m in matches
             ):
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 
-from ._py3compat import py3, try_decode
+from ._py3compat import py3
 from .line import (
     current_word,
     current_import,
@@ -76,22 +76,21 @@ def attr_matches(cw, prefix="", only_modules=False):
         return set()
     module = sys.modules[module_name]
     if only_modules:
-        matches = (
+        matches = {
             name
             for name in dir(module)
             if name.startswith(name_after_dot)
             and "%s.%s" % (module_name, name) in sys.modules
-        )
+        }
     else:
-        matches = (
+        matches = {
             name for name in dir(module) if name.startswith(name_after_dot)
-        )
+        }
     module_part, _, _ = cw.rpartition(".")
     if module_part:
-        matches = ("%s.%s" % (module_part, m) for m in matches)
+        matches = {"%s.%s" % (module_part, m) for m in matches}
 
-    generator = (try_decode(match, "ascii") for match in matches)
-    return set(filter(lambda x: x is not None, generator))
+    return matches
 
 
 def module_attr_matches(name):
@@ -210,16 +209,13 @@ def find_all_modules(path=None):
     """Return a list with all modules in `path`, which should be a list of
     directory names. If path is not given, sys.path will be used."""
     if path is None:
-        modules.update(try_decode(m, "ascii") for m in sys.builtin_module_names)
+        modules.update(sys.builtin_module_names)
         path = sys.path
 
     for p in path:
         if not p:
             p = os.curdir
         for module in find_modules(p):
-            module = try_decode(module, "ascii")
-            if module is None:
-                continue
             modules.add(module)
             yield
 
