Remove the __builtin__ compatibility

jedi/inference/__init__.py

@@ -124,8 +124,6 @@ class InferenceState(object):
     @inference_state_function_cache()
     def builtins_module(self):
         module_name = u'builtins'
-        if self.environment.version_info.major == 2:
-            module_name = u'__builtin__'
         builtins_module, = self.import_module((module_name,), sys_path=())
         return builtins_module
 

jedi/inference/compiled/access.py

@@ -6,9 +6,9 @@ import operator as op
 from collections import namedtuple
 import warnings
 import re
+import builtins
 
-from jedi._compatibility import unicode, is_py3, builtins, \
-    py_version, force_unicode
+from jedi._compatibility import unicode, is_py3, py_version, force_unicode
 from jedi.inference.compiled.getattr_static import getattr_static
 
 ALLOWED_GETITEM_TYPES = (str, list, tuple, unicode, bytes, bytearray, dict)
@@ -267,19 +267,17 @@ class DirectObjectAccess(object):
     @_force_unicode_decorator
     @shorten_repr
     def get_repr(self):
-        builtins = 'builtins', '__builtin__'
-
         if inspect.ismodule(self._obj):
             return repr(self._obj)
         # Try to avoid execution of the property.
-        if safe_getattr(self._obj, '__module__', default='') in builtins:
+        if safe_getattr(self._obj, '__module__', default='') == 'builtins':
             return repr(self._obj)
 
         type_ = type(self._obj)
         if type_ == type:
             return type.__repr__(self._obj)
 
-        if safe_getattr(type_, '__module__', default='') in builtins:
+        if safe_getattr(type_, '__module__', default='') == 'builtins':
             # Allow direct execution of repr for builtins.
             return repr(self._obj)
         return object.__repr__(self._obj)

jedi/inference/gradual/typing.py

@@ -263,8 +263,6 @@ class TypeAlias(LazyValueWrapper):
 
     def _get_wrapped_value(self):
         module_name, class_name = self._actual.split('.')
-        if self.inference_state.environment.version_info.major == 2 and module_name == 'builtins':
-            module_name = '__builtin__'
 
         # TODO use inference_state.import_module?
         from jedi.inference.imports import Importer