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

DefaultEnvironment -> SameEnvironment

Browse Source
This commit is contained in:
Dave Halter
2018-04-12 09:00:19 +02:00
parent f4317dadc4
commit b8e879bc53
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/api/environment.py
View File

@@ -90,9 +90,9 @@ class _Environment(_BaseEnvironment):
return self._get_subprocess().get_sys_path() return self._get_subprocess().get_sys_path()
class DefaultEnvironment(_Environment): class SameEnvironment(_Environment):
def __init__(self): def __init__(self):
super(DefaultEnvironment, self).__init__(sys.prefix, sys.executable) super(SameEnvironment, self).__init__(sys.prefix, sys.executable)
def _get_version(self): def _get_version(self):
return _VersionInfo(*sys.version_info[:3]) return _VersionInfo(*sys.version_info[:3])
@@ -113,7 +113,7 @@ def _get_virtual_env_from_var():
var = os.environ.get('VIRTUAL_ENV') var = os.environ.get('VIRTUAL_ENV')
if var is not None: if var is not None:
if var == sys.prefix: if var == sys.prefix:
return DefaultEnvironment() return SameEnvironment()
try: try:
return create_environment(var) return create_environment(var)
@@ -191,7 +191,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 SameEnvironment()
else: else:
try: try:
yield get_python_environment('python' + version_string) yield get_python_environment('python' + version_string)

4
jedi/api/project.py
View File

@@ -2,7 +2,7 @@ import os
import json import json
from jedi._compatibility import FileNotFoundError, NotADirectoryError from jedi._compatibility import FileNotFoundError, NotADirectoryError
from jedi.api.environment import DefaultEnvironment, \ from jedi.api.environment import SameEnvironment, \
get_default_environment, from_executable get_default_environment, from_executable
from jedi.api.exceptions import WrongVersion from jedi.api.exceptions import WrongVersion
from jedi._compatibility import force_unicode from jedi._compatibility import force_unicode
@@ -70,7 +70,7 @@ class Project(object):
def py2_comp(path, environment=None, sys_path=None, def py2_comp(path, environment=None, sys_path=None,
smart_sys_path=True, _django=False): smart_sys_path=True, _django=False):
self._path = path self._path = path
if isinstance(environment, DefaultEnvironment): if isinstance(environment, SameEnvironment):
self._environment = environment self._environment = environment
self._executable = environment._executable self._executable = environment._executable