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

move is_nested check from evaluate.imports to the parser

Browse Source
This commit is contained in:
Dave Halter
2014-05-12 11:02:57 +02:00
parent 04855e9452
commit 13949ec145
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jedi/evaluate/imports.py
View File

@@ -60,7 +60,7 @@ class ImportWrapper(pr.Base):
if import_stmt.from_ns: if import_stmt.from_ns:
import_path += import_stmt.from_ns.names import_path += import_stmt.from_ns.names
if import_stmt.namespace: if import_stmt.namespace:
if self._is_nested_import() and not direct_resolve: if self.import_stmt.is_nested() and not direct_resolve:
import_path.append(import_stmt.namespace.names[0]) import_path.append(import_stmt.namespace.names[0])
else: else:
import_path += import_stmt.namespace.names import_path += import_stmt.namespace.names
@@ -148,17 +148,6 @@ class ImportWrapper(pr.Base):
names.append(self._generate_name(name)) names.append(self._generate_name(name))
return names return names
def _is_nested_import(self):
"""
This checks for the special case of nested imports, without aliases and
from statement::
import foo.bar
"""
return not self.import_stmt.alias and not self.import_stmt.from_ns \
and len(self.import_stmt.namespace.names) > 1 \
and not self.direct_resolve
def _is_relative_import(self): def _is_relative_import(self):
return bool(self.import_stmt.relative_count) return bool(self.import_stmt.relative_count)
@@ -174,7 +163,7 @@ class ImportWrapper(pr.Base):
analysis.add(self._evaluator, 'import-error', self.import_stmt) analysis.add(self._evaluator, 'import-error', self.import_stmt)
return [] return []
if self._is_nested_import(): if self.import_stmt.is_nested() and not self.direct_resolve:
scopes = [NestedImportModule(scope, self.import_stmt)] scopes = [NestedImportModule(scope, self.import_stmt)]
else: else:
scopes = [scope] scopes = [scope]
@@ -218,7 +207,6 @@ class NestedImportModule(pr.Module):
def _get_nested_import_name(self): def _get_nested_import_name(self):
""" """
See documentation of `self._is_nested_import`.
Generates an Import statement, that can be used to fake nested imports. Generates an Import statement, that can be used to fake nested imports.
""" """
i = self._nested_import i = self._nested_import

10
jedi/parser/representation.py
View File

@@ -776,6 +776,16 @@ class Import(Simple):
n.append(self.alias) n.append(self.alias)
return n return n
def is_nested(self):
"""
This checks for the special case of nested imports, without aliases and
from statement::
import foo.bar
"""
return not self.alias and not self.from_ns \
and len(self.namespace.names) > 1 \
class KeywordStatement(Base): class KeywordStatement(Base):
""" """