Move ImportName and add os path name to the submodule dict

jedi/evaluate/context/module.py

@@ -6,6 +6,7 @@ from jedi.evaluate.filters import GlobalNameFilter, ContextNameMixin, \
     AbstractNameDefinition, ParserTreeFilter, DictFilter, MergedFilter
 from jedi.evaluate import compiled
 from jedi.evaluate.base_context import TreeContext
+from jedi.evaluate.names import SubModuleName, OsPathName
 
 
 class _ModuleAttributeName(AbstractNameDefinition):
@@ -41,8 +42,6 @@ class SubModuleDictMixin(object):
         Lists modules in the directory of this module (if this module is a
         package).
         """
-        from jedi.evaluate.imports import SubModuleName
-
         names = {}
         try:
             method = self.py__path__
@@ -54,13 +53,8 @@ class SubModuleDictMixin(object):
                 # It's obviously a relative import to the current module.
                 names[name] = SubModuleName(self, name)
 
-        # TODO add something like this in the future, its cleaner than the
-        #   import hacks.
-        # ``os.path`` is a hardcoded exception, because it's a
-        # ``sys.modules`` modification.
-        # if str(self.name) == 'os':
-        #     names.append(Name('path', parent_context=self))
-
+        # In the case of an import like `from x.` we don't need to
+        # add all the variables, this is only about submodules.
         return names
 
     def _iter_module_names(self, path):
@@ -214,6 +208,15 @@ class ModuleContext(ModuleMixin, TreeContext):
         assert file is not None  # Shouldn't be a package in the first place.
         return [os.path.dirname(file)]
 
+    def sub_modules_dict(self):
+        dct = super(ModuleContext, self).sub_modules_dict()
+        if ('os',) == self.string_names:
+            dct = dict(dct)
+            # os.path is a hardcoded exception, because it's a
+            # ``sys.modules`` modification.
+            dct['path'] = OsPathName(self, 'path')
+        return dct
+
     @property
     def py__path__(self):
         """

jedi/evaluate/imports.py

@@ -29,7 +29,7 @@ from jedi.evaluate import compiled
 from jedi.evaluate import analysis
 from jedi.evaluate.utils import unite
 from jedi.evaluate.cache import evaluator_method_cache
-from jedi.evaluate.filters import AbstractNameDefinition
+from jedi.evaluate.names import ImportName, SubModuleName
 from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS
 from jedi.evaluate.gradual.typeshed import import_module_decorator
 
@@ -153,43 +153,6 @@ def _add_error(context, name, message):
         debug.warning('ImportError without origin: ' + message)
 
 
-class ImportName(AbstractNameDefinition):
-    start_pos = (1, 0)
-    _level = 0
-
-    def __init__(self, parent_context, string_name):
-        self.parent_context = parent_context
-        self.string_name = string_name
-
-    def infer(self):
-        return Importer(
-            self.parent_context.evaluator,
-            [self.string_name],
-            self.parent_context,
-            level=self._level,
-        ).follow()
-
-    def goto(self):
-        return [m.name for m in self.infer()]
-
-    def get_root_context(self):
-        # Not sure if this is correct.
-        return self.parent_context.get_root_context()
-
-    @property
-    def api_type(self):
-        return 'module'
-
-
-class SubModuleName(ImportName):
-    _level = 1
-
-
-class OsPathName(ImportName):
-    def infer(self):
-        return self.parent_context.evaluator.import_module(('os', 'path'))
-
-
 def _level_to_base_import_path(project_path, directory, level):
     """
     In case the level is outside of the currently known package (something like
@@ -394,22 +357,8 @@ class Importer(object):
                 if context.api_type != 'module':  # not a module
                     continue
                 names += context.sub_modules_dict().values()
-                # namespace packages
-                #try:
-                #    path_method = context.py__path__
-                #except AttributeError:
-                #    pass
-                #else:
-                #    # For implicit namespace packages and module names.
-                #    names += self._get_module_names(path_method(), in_module=context)
 
                 if only_modules:
-                    # In the case of an import like `from x.` we don't need to
-                    # add all the variables.
-                    if ('os',) == self._str_import_path and not self.level:
-                        # os.path is a hardcoded exception, because it's a
-                        # ``sys.modules`` modification.
-                        names.append(OsPathName(context, 'path'))
                     continue
 
                 for filter in context.get_filters(search_global=False):