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

put some list casts into a different place.

Browse Source
This commit is contained in:
Dave Halter
2014-04-10 12:24:30 +02:00
parent 6de46fe373
commit 14bf618af0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/evaluate/imports.py
View File

@@ -14,7 +14,7 @@ statements like ``from datetim`` (curser at the end would return ``datetime``).
import os import os
import pkgutil import pkgutil
import sys import sys
import itertools from itertools import chain
from jedi._compatibility import find_module from jedi._compatibility import find_module
from jedi import common from jedi import common
@@ -202,13 +202,13 @@ class ImportPath(pr.Base):
scopes = self._evaluator.follow_path(iter(rest), [scope], scope) scopes = self._evaluator.follow_path(iter(rest), [scope], scope)
elif rest: elif rest:
if is_goto: if is_goto:
scopes = itertools.chain.from_iterable( scopes = list(chain.from_iterable(
self._evaluator.find_types(s, rest[0], is_goto=True) self._evaluator.find_types(s, rest[0], is_goto=True)
for s in scopes) for s in scopes))
else: else:
scopes = itertools.chain.from_iterable( scopes = list(chain.from_iterable(
self._evaluator.follow_path(iter(rest), [s], s) self._evaluator.follow_path(iter(rest), [s], s)
for s in scopes) for s in scopes))
if self._is_nested_import(): if self._is_nested_import():
scopes.append(self._get_nested_import(scope)) scopes.append(self._get_nested_import(scope))
@@ -216,7 +216,7 @@ class ImportPath(pr.Base):
scopes = [ImportPath.GlobalNamespace] scopes = [ImportPath.GlobalNamespace]
debug.dbg('after import: %s', scopes) debug.dbg('after import: %s', scopes)
self._evaluator.recursion_detector.pop_stmt() self._evaluator.recursion_detector.pop_stmt()
return list(scopes) return scopes
class Importer(object): class Importer(object):