mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vox: Restore vox functionality

Browse source 
After the recent changes in environment defaults, the vox xontrib
could not "see" the virtual environments and work with them.
This commit is contained in:
David Strobach 2020-08-23 11:16:26 +02:00
parent be68670f1c
commit 5c2e5a3d8d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xontrib/voxapi.py
View file

@ -332,9 +332,10 @@ class Vox(collections.abc.Mapping):
Returns None if no environment is active. Returns None if no environment is active.
""" """
if "VIRTUAL_ENV" not in builtins.__xonsh__.env: env = builtins.__xonsh__.env
if not env["VIRTUAL_ENV"]:
return return
env_path = builtins.__xonsh__.env["VIRTUAL_ENV"] env_path = env["VIRTUAL_ENV"]
if env_path.startswith(self.venvdir): if env_path.startswith(self.venvdir):
name = env_path[len(self.venvdir) :] name = env_path[len(self.venvdir) :]
if name[0] in "/\\": if name[0] in "/\\":
@ -354,7 +355,7 @@ class Vox(collections.abc.Mapping):
""" """
env = builtins.__xonsh__.env env = builtins.__xonsh__.env
ve = self[name] ve = self[name]
if "VIRTUAL_ENV" in env: if env["VIRTUAL_ENV"]:
self.deactivate() self.deactivate()
type(self).oldvars = {"PATH": list(env["PATH"])} type(self).oldvars = {"PATH": list(env["PATH"])}
@ -370,7 +371,7 @@ class Vox(collections.abc.Mapping):
Deactivate the active virtual environment. Returns its name. Deactivate the active virtual environment. Returns its name.
""" """
env = builtins.__xonsh__.env env = builtins.__xonsh__.env
if "VIRTUAL_ENV" not in env: if not env["VIRTUAL_ENV"]:
raise NoEnvironmentActive("No environment currently active.") raise NoEnvironmentActive("No environment currently active.")
env_name = self.active() env_name = self.active()
@ -380,7 +381,7 @@ class Vox(collections.abc.Mapping):
env[k] = v env[k] = v
del type(self).oldvars del type(self).oldvars
env.pop("VIRTUAL_ENV") del env["VIRTUAL_ENV"]
events.vox_on_deactivate.fire(name=env_name, path=self[env_name].env) events.vox_on_deactivate.fire(name=env_name, path=self[env_name].env)
return env_name return env_name