From ad48ec4cfda1a99df9a511930d34fd411bcfbf33 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 7 May 2019 00:09:19 +0200 Subject: [PATCH] With typeshed OsPathName is no longer needed --- jedi/evaluate/context/module.py | 11 +---------- jedi/evaluate/names.py | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/jedi/evaluate/context/module.py b/jedi/evaluate/context/module.py index 8430dc1e..0cb2ca57 100644 --- a/jedi/evaluate/context/module.py +++ b/jedi/evaluate/context/module.py @@ -6,7 +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 +from jedi.evaluate.names import SubModuleName class _ModuleAttributeName(AbstractNameDefinition): @@ -208,15 +208,6 @@ 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): """ diff --git a/jedi/evaluate/names.py b/jedi/evaluate/names.py index 6c58435c..466d964f 100644 --- a/jedi/evaluate/names.py +++ b/jedi/evaluate/names.py @@ -32,8 +32,3 @@ class ImportName(AbstractNameDefinition): class SubModuleName(ImportName): _level = 1 - - -class OsPathName(ImportName): - def infer(self): - return self.parent_context.evaluator.import_module(('os', 'path'))