VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-09 15:24:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DefaultEnvironment -> get_default_environment

Browse Source
This commit is contained in:
Dave Halter
2017-12-15 18:13:21 +01:00
parent 3cd5fa3c20
commit 0d7f93c019
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/api/__init__.py
View File

@@ -24,7 +24,7 @@ from jedi.api import classes
from jedi.api import interpreter from jedi.api import interpreter
from jedi.api import helpers from jedi.api import helpers
from jedi.api.completion import Completion 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 Evaluator
from jedi.evaluate import imports from jedi.evaluate import imports
from jedi.evaluate import usages 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 import ModuleContext
from jedi.evaluate.context.module import ModuleName from jedi.evaluate.context.module import ModuleName
from jedi.evaluate.context.iterable import unpack_tuple_to_dict 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 # Jedi uses lots and lots of recursion. By setting this a little bit higher, we
# can remove some "maximum recursion depth" errors. # can remove some "maximum recursion depth" errors.
@@ -121,7 +120,7 @@ class Script(object):
compiled_subprocess = None compiled_subprocess = None
else: else:
if environment is None: if environment is None:
environment = DefaultEnvironment() environment = get_default_environment()
compiled_subprocess = environment.get_subprocess() compiled_subprocess = environment.get_subprocess()
self._evaluator = Evaluator(self._grammar, project, compiled_subprocess) self._evaluator = Evaluator(self._grammar, project, compiled_subprocess)
project.add_script_path(self.path) project.add_script_path(self.path)

7
jedi/api/virtualenv.py
View File

@@ -45,9 +45,8 @@ class Environment(object):
return self.get_subprocess().get_sys_path() return self.get_subprocess().get_sys_path()
class DefaultEnvironment(Environment): def get_default_environment():
def __init__(self): return Environment(sys.prefix, sys.executable)
super(DefaultEnvironment, self).__init__(sys.prefix, sys.executable)
def find_virtualenvs(paths=None): 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) current_version = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
for version_string in _SUPPORTED_PYTHONS: for version_string in _SUPPORTED_PYTHONS:
if version_string == current_version: if version_string == current_version:
yield DefaultEnvironment() yield get_default_environment()
else: else:
exe = find_executable('python' + version_string) exe = find_executable('python' + version_string)
if exe is not None: if exe is not None:

5
test/test_api/test_environment.py
View File

@@ -1,13 +1,12 @@
import pytest import pytest
import jedi
from jedi._compatibility import py_version 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 InvalidPythonEnvironment, find_python_environments
def test_sys_path(): def test_sys_path():
assert DefaultEnvironment().get_sys_path() assert get_default_environment().get_sys_path()
def test_find_python_environments(): def test_find_python_environments():