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

Issues with imports.

Browse Source
This commit is contained in:
Dave Halter
2014-09-24 21:12:38 +02:00
parent ff61c1d81c
commit c43afae24a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/parser/__init__.py
View File

@@ -120,7 +120,7 @@ class Parser(object):
tok = next(self._gen) if pre_used_token is None else pre_used_token tok = next(self._gen) if pre_used_token is None else pre_used_token
if tok.type != tokenize.NAME and tok.string != '*': if tok.type != tokenize.NAME and tok.string != '*':
return None, tok return [], tok
append(tok) append(tok)
while True: while True:
@@ -493,9 +493,9 @@ class Parser(object):
defunct = True defunct = True
if tok_str != 'import': if tok_str != 'import':
self._gen.push_last_back() self._gen.push_last_back()
names = self._parse_import_list() imports = self._parse_import_list()
for count, (names, alias, defunct2) in enumerate(names): for count, (names, alias, defunct2) in enumerate(imports):
star = names and unicode(names) == '*' star = names and unicode(names[-1]) == '*'
if star: if star:
names = [] names = []
e = (alias or names and names[-1] or self._gen.previous).end_pos e = (alias or names and names[-1] or self._gen.previous).end_pos

2
jedi/parser/representation.py
View File

@@ -494,7 +494,7 @@ class SubModule(Scope, Module):
is a ``__future__`` import. is a ``__future__`` import.
""" """
for imp in self.imports: for imp in self.imports:
if imp.from_names is None or imp.namespace_names is None: if not imp.from_names or not imp.namespace_names:
continue continue
namespace, feature = imp.from_names[0], imp.namespace_names[0] namespace, feature = imp.from_names[0], imp.namespace_names[0]