VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

a follow function for the Importer which solves the issues with follow_definitions

Browse Source
This commit is contained in:
Dave Halter
2014-03-21 14:09:12 +01:00
parent fa0502d762
commit 83b7190a0a
2 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/api/classes.py
View File

@@ -401,17 +401,12 @@ class Completion(BaseDefinition):
defs = self._evaluator.eval_statement(self._definition)
elif self._definition.isinstance(pr.Import):
if self._definition.alias is None:
print('ha', self._definition, repr(self._name))
i = imports.ImportPath(self._evaluator, self._definition, True)
print('h', i.import_path + [unicode(self._name)])
defs = imports.Importer(i.import_path + [unicode(self._name)],
i._importer.module).follow_file_system()[0]
defs = [defs]
print(defs)
i._importer.module).follow(self._evaluator)
else:
defs = imports.strip_imports(self._evaluator, [self._definition])
else:
print('else', self._definition)
return [self]
defs = [BaseDefinition(self._evaluator, d, d.start_pos) for d in defs]

26
jedi/evaluate/imports.py
View File

@@ -267,29 +267,11 @@ class Importer(object):
return in_path + sys_path.sys_path_with_modifications(self.module)
def follow(self, evaluator):
try:
scope, rest = self._importer.follow_file_system()
except ModuleNotFound:
debug.warning('Module not found: %s', self.import_stmt)
return []
scopes = [scope]
scopes += remove_star_imports(self._evaluator, scope)
scope, rest = self.follow_file_system()
if rest:
# follow the rest of the import (not FS -> classes, functions)
if len(rest) > 1 or rest and self.is_like_search:
scopes = []
if ['os', 'path'] == self.import_path[:2] \
and not self._is_relative_import():
# This is a huge exception, we follow a nested import
# ``os.path``, because it's a very important one in Python
# that is being achieved by messing with ``sys.modules`` in
# ``os``.
scopes = self._evaluator.follow_path(iter(rest), [scope], scope)
elif rest:
scopes = itertools.chain.from_iterable(
self._evaluator.follow_path(iter(rest), [s], s)
for s in scopes)
return evaluator.follow_path(iter(rest), [scope], scope)
return [scope]
def follow_file_system(self):
if self.file_path: