diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index d35e09bb..dbdaa42f 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -24,7 +24,7 @@ from jedi.api import classes from jedi.api import interpreter from jedi.api import helpers from jedi.api.completion import Completion -from jedi.api.virtualenv import DefaultEnvironment +from jedi.api.virtualenv import get_default_environment from jedi.evaluate import Evaluator from jedi.evaluate import imports from jedi.evaluate import usages @@ -37,7 +37,6 @@ from jedi.evaluate.syntax_tree import tree_name_to_contexts from jedi.evaluate.context import ModuleContext from jedi.evaluate.context.module import ModuleName from jedi.evaluate.context.iterable import unpack_tuple_to_dict -from jedi.evaluate.compiled.subprocess import get_subprocess # Jedi uses lots and lots of recursion. By setting this a little bit higher, we # can remove some "maximum recursion depth" errors. @@ -121,7 +120,7 @@ class Script(object): compiled_subprocess = None else: if environment is None: - environment = DefaultEnvironment() + environment = get_default_environment() compiled_subprocess = environment.get_subprocess() self._evaluator = Evaluator(self._grammar, project, compiled_subprocess) project.add_script_path(self.path) diff --git a/jedi/api/virtualenv.py b/jedi/api/virtualenv.py index 565e4fd1..56c658b9 100644 --- a/jedi/api/virtualenv.py +++ b/jedi/api/virtualenv.py @@ -45,9 +45,8 @@ class Environment(object): return self.get_subprocess().get_sys_path() -class DefaultEnvironment(Environment): - def __init__(self): - super(DefaultEnvironment, self).__init__(sys.prefix, sys.executable) +def get_default_environment(): + return Environment(sys.prefix, sys.executable) def find_virtualenvs(paths=None): @@ -69,7 +68,7 @@ def find_python_environments(): current_version = '%s.%s' % (sys.version_info.major, sys.version_info.minor) for version_string in _SUPPORTED_PYTHONS: if version_string == current_version: - yield DefaultEnvironment() + yield get_default_environment() else: exe = find_executable('python' + version_string) if exe is not None: diff --git a/test/test_api/test_environment.py b/test/test_api/test_environment.py index d5be09c7..cd9f2d81 100644 --- a/test/test_api/test_environment.py +++ b/test/test_api/test_environment.py @@ -1,13 +1,12 @@ import pytest -import jedi from jedi._compatibility import py_version -from jedi.api.virtualenv import Environment, DefaultEnvironment, \ +from jedi.api.virtualenv import Environment, get_default_environment, \ InvalidPythonEnvironment, find_python_environments def test_sys_path(): - assert DefaultEnvironment().get_sys_path() + assert get_default_environment().get_sys_path() def test_find_python_environments():