From 83266581344d55a2240162e14fd5d1800a230a4b Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 24 Dec 2013 19:55:11 +0100 Subject: [PATCH] more improvements, so that almost all import tests pass again --- jedi/evaluate/__init__.py | 2 +- jedi/evaluate/imports.py | 2 +- jedi/evaluate/representation.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index f9af24d7..86432196 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -587,7 +587,7 @@ class Evaluator(object): current = next(path) if isinstance(current, pr.Array): - result = [er.Array(current)] + result = [er.Array(self, current)] else: if isinstance(current, pr.NamePart): # This is the first global lookup. diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index c6a5d913..aa6637fa 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -196,7 +196,7 @@ class ImportPath(pr.Base): scope, rest = self._follow_file_system() except ModuleNotFound: debug.warning('Module not found: ' + str(self.import_stmt)) - self._evaluator.follow_statement.pop_stmt() + self._evaluator.recursion_detector.pop_stmt() return [] scopes = [scope] diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index dee8a273..c69b2439 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -506,7 +506,7 @@ class Execution(Executable): for listener in func.listeners: listener.execute(self._get_params()) if func.is_generator and not evaluate_generator: - return [Generator(func, self.var_args)] + return [Generator(self._evaluator, func, self.var_args)] else: """ stmts = docstrings.find_return_types(func)