From 14bf618af0007d2ca0aaf76be0c2915a8bef4943 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 10 Apr 2014 12:24:30 +0200 Subject: [PATCH] put some list casts into a different place. --- jedi/evaluate/imports.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index ca2a1766..686874f4 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -14,7 +14,7 @@ statements like ``from datetim`` (curser at the end would return ``datetime``). import os import pkgutil import sys -import itertools +from itertools import chain from jedi._compatibility import find_module from jedi import common @@ -202,13 +202,13 @@ class ImportPath(pr.Base): scopes = self._evaluator.follow_path(iter(rest), [scope], scope) elif rest: if is_goto: - scopes = itertools.chain.from_iterable( + scopes = list(chain.from_iterable( self._evaluator.find_types(s, rest[0], is_goto=True) - for s in scopes) + for s in scopes)) else: - scopes = itertools.chain.from_iterable( + scopes = list(chain.from_iterable( self._evaluator.follow_path(iter(rest), [s], s) - for s in scopes) + for s in scopes)) if self._is_nested_import(): scopes.append(self._get_nested_import(scope)) @@ -216,7 +216,7 @@ class ImportPath(pr.Base): scopes = [ImportPath.GlobalNamespace] debug.dbg('after import: %s', scopes) self._evaluator.recursion_detector.pop_stmt() - return list(scopes) + return scopes class Importer(object):