diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index 7f8a33b3..1a9ad571 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -62,8 +62,6 @@ only *evaluates* what needs to be *evaluated*. All the statements and modules that are not used are just being ignored. """ -import sys - from parso.python import tree import parso @@ -104,7 +102,6 @@ class Evaluator(object): self.analysis = [] self.dynamic_params_depth = 0 self.is_analysis = False - self.python_version = sys.version_info[:2] self.project = project self.access_cache = {} project.add_evaluator(self) diff --git a/jedi/evaluate/compiled/subprocess/__init__.py b/jedi/evaluate/compiled/subprocess/__init__.py index 153357a6..db791198 100644 --- a/jedi/evaluate/compiled/subprocess/__init__.py +++ b/jedi/evaluate/compiled/subprocess/__init__.py @@ -300,4 +300,8 @@ class AccessHandle(object): @memoize_method def _cached_results(self, name, *args, **kwargs): + if type(self._subprocess) == EvaluatorSubprocess: + print(name, args, kwargs, + self._subprocess.get_compiled_method_return(self.id, name, *args, **kwargs) + ) return self._subprocess.get_compiled_method_return(self.id, name, *args, **kwargs) diff --git a/jedi/evaluate/stdlib.py b/jedi/evaluate/stdlib.py index 72e35650..f21a74ff 100644 --- a/jedi/evaluate/stdlib.py +++ b/jedi/evaluate/stdlib.py @@ -136,7 +136,7 @@ def builtins_next(evaluator, iterators, defaults): TODO this function is currently not used. It's a stab at implementing next in a different way than fake objects. This would be a bit more flexible. """ - if evaluator.python_version[0] == 2: + if evaluator.environment.version_info.major == 2: name = 'next' else: name = '__next__'