Python 3 compatible __builtin__ import

sebastinas · sebastinas · commit 331c9fd06b62 · 2015-02-04T17:54:33.000+01:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 #
 
-import __builtin__
 import __main__
 import abc
 import keyword
@@ -36,6 +35,11 @@
 from bpython._py3compat import py3
 from bpython.lazyre import LazyReCompile
 
+try:
+    import builtins
+except ImportError:
+    import __builtin__ as builtins
+
 
 # Autocomplete modes
 SIMPLE = 'simple'
@@ -286,7 +290,7 @@ def matches(self, cursor_offset, line, **kwargs):
         for word in keyword.kwlist:
             if method_match(word, n, text):
                 matches.add(word)
-        for nspace in [__builtin__.__dict__, locals_]:
+        for nspace in [builtins.__dict__, locals_]:
             for word, val in nspace.items():
                 if method_match(word, len(text), text) and word != "__builtins__":
                     matches.add(_callable_postfix(val, word))
