Alternate code path for deprectated imp functions in Python 3.3

thomasballinger · thomasballinger · commit 8ddbdcec05b6 · 2014-07-04T22:52:26.000-04:00
fixes #296
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -27,6 +27,13 @@
 import os
 import sys
 import warnings
+
+if sys.version_info[0] == 3 and sys.version_info[1] >= 3:
+    import importlib.machinery
+    SUFFIXES = importlib.machinery.all_suffixes()
+else:
+    SUFFIXES = [suffix for suffix, mode, type in imp.get_suffixes()]
+
 try:
     from warnings import catch_warnings
 except ImportError:
@@ -124,17 +131,17 @@ def find_modules(path):
     except EnvironmentError:
         filenames = []
     for name in filenames:
-        if not any(name.endswith(suffix[0]) for suffix in imp.get_suffixes()):
+        if not any(name.endswith(suffix) for suffix in SUFFIXES):
             # Possibly a package
             if '.' in name:
                 continue
         elif os.path.isdir(os.path.join(path, name)):
             # Unfortunately, CPython just crashes if there is a directory
             # which ends with a python extension, so work around.
             continue
-        for suffix in imp.get_suffixes():
-            if name.endswith(suffix[0]):
-                name = name[:-len(suffix[0])]
+        for suffix in SUFFIXES:
+            if name.endswith(suffix):
+                name = name[:-len(suffix)]
                 break
         if py3 and name == "badsyntax_pep3120":
             # Workaround for issue #166
