From fae0a7b0c429010a467c251eadcedb98054649ea Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 24 Nov 2014 01:56:54 +0100 Subject: [PATCH] Small fixes for past mistakes. --- jedi/evaluate/__init__.py | 3 +-- jedi/evaluate/imports.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index 0a0fa698..91d0e5ba 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -74,7 +74,6 @@ from itertools import tee, chain from jedi._compatibility import next, hasattr, unicode from jedi.parser import tree as pr from jedi.parser.tokenize import Token -from jedi.parser import fast from jedi import debug from jedi.evaluate import representation as er from jedi.evaluate import imports @@ -91,7 +90,7 @@ from jedi.evaluate.helpers import FakeStatement, deep_ast_copy, call_of_name class Evaluator(object): def __init__(self, grammar): - self._grammar = grammar + self.grammar = grammar self.memoize_cache = {} # for memoize decorators self.import_cache = {} # like `sys.modules`. self.compiled_cache = {} # see `compiled.create()` diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index 9e1e15d4..10d31425 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -184,7 +184,7 @@ class ImportWrapper2(pr.Base): rel_path = os.path.join(self._importer.get_relative_path(), '__init__.py') if os.path.exists(rel_path): - m = _load_module(self.evaluator, rel_path) + m = _load_module(self._evaluator, rel_path) names += m.get_defined_names() else: # flask @@ -590,9 +590,9 @@ class _Importer(object): else: source = current_namespace[0].read() current_namespace[0].close() - return _load_module(self.evaluator, path, source, sys_path=sys_path), rest + return _load_module(self._evaluator, path, source, sys_path=sys_path), rest else: - return _load_module(self.evaluator, name=path, sys_path=sys_path), rest + return _load_module(self._evaluator, name=path, sys_path=sys_path), rest def follow_imports(evaluator, scopes):