https://github.com/python/cpython/commit/8edc8029def8040ebe1caf75d815439156dd2124
commit: 8edc8029def8040ebe1caf75d815439156dd2124
branch: main
author: Jim Porter <826865+jimpor...@users.noreply.github.com>
committer: vsajip <vinay_sa...@yahoo.co.uk>
date: 2024-01-23T08:53:04Z
summary:
gh-89427: Provide the original prompt value for VIRTUAL_ENV_PROMPT (GH-106726)
This improves the implementation in gh-106643.
Previously, venv passed "(<prompt>) " to the activation scripts, but we want
to provide the original value so that users can inspect it in the
$VIRTUAL_ENV_PROMPT env var.
Note: Lib/venv/scripts/common/Activate.ps1 surrounded the prompt value with
parens a second time, so no change was necessary in that file.
files:
M Lib/test/test_venv.py
M Lib/venv/__init__.py
M Lib/venv/scripts/common/activate
M Lib/venv/scripts/nt/activate.bat
M Lib/venv/scripts/posix/activate.csh
M Lib/venv/scripts/posix/activate.fish
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 6852625c36c62b..6dda00efd7bbb6 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -169,7 +169,7 @@ def test_config_file_command_key(self):
('--clear', 'clear', True),
('--upgrade', 'upgrade', True),
('--upgrade-deps', 'upgrade_deps', True),
- ('--prompt', 'prompt', True),
+ ('--prompt="foobar"', 'prompt', 'foobar'),
('--without-scm-ignore-files', 'scm_ignore_files', frozenset()),
]
for opt, attr, value in options:
@@ -201,7 +201,7 @@ def test_prompt(self):
self.run_with_capture(builder.create, self.env_dir)
context = builder.ensure_directories(self.env_dir)
data = self.get_text_file_contents('pyvenv.cfg')
- self.assertEqual(context.prompt, '(%s) ' % env_name)
+ self.assertEqual(context.prompt, env_name)
self.assertNotIn("prompt = ", data)
rmtree(self.env_dir)
@@ -209,7 +209,7 @@ def test_prompt(self):
self.run_with_capture(builder.create, self.env_dir)
context = builder.ensure_directories(self.env_dir)
data = self.get_text_file_contents('pyvenv.cfg')
- self.assertEqual(context.prompt, '(My prompt) ')
+ self.assertEqual(context.prompt, 'My prompt')
self.assertIn("prompt = 'My prompt'\n", data)
rmtree(self.env_dir)
@@ -218,7 +218,7 @@ def test_prompt(self):
self.run_with_capture(builder.create, self.env_dir)
context = builder.ensure_directories(self.env_dir)
data = self.get_text_file_contents('pyvenv.cfg')
- self.assertEqual(context.prompt, '(%s) ' % cwd)
+ self.assertEqual(context.prompt, cwd)
self.assertIn("prompt = '%s'\n" % cwd, data)
def test_upgrade_dependencies(self):
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
index f04ca8fafcc33b..4856594755ae57 100644
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -129,8 +129,7 @@ def create_if_needed(d):
context = types.SimpleNamespace()
context.env_dir = env_dir
context.env_name = os.path.split(env_dir)[1]
- prompt = self.prompt if self.prompt is not None else context.env_name
- context.prompt = '(%s) ' % prompt
+ context.prompt = self.prompt if self.prompt is not None else
context.env_name
create_if_needed(env_dir)
executable = sys._base_executable
if not executable: # see gh-96861
diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate
index a4e0609045a9d5..cbd4873f012246 100644
--- a/Lib/venv/scripts/common/activate
+++ b/Lib/venv/scripts/common/activate
@@ -66,7 +66,7 @@ fi
if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
_OLD_VIRTUAL_PS1="${PS1:-}"
- PS1="__VENV_PROMPT__${PS1:-}"
+ PS1="(__VENV_PROMPT__) ${PS1:-}"
export PS1
fi
diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat
index c1c3c82ee37f10..2c98122362a060 100644
--- a/Lib/venv/scripts/nt/activate.bat
+++ b/Lib/venv/scripts/nt/activate.bat
@@ -16,7 +16,7 @@ if defined _OLD_VIRTUAL_PROMPT set
PROMPT=%_OLD_VIRTUAL_PROMPT%
if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
set _OLD_VIRTUAL_PROMPT=%PROMPT%
-set PROMPT=__VENV_PROMPT__%PROMPT%
+set PROMPT=(__VENV_PROMPT__) %PROMPT%
if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
set PYTHONHOME=
diff --git a/Lib/venv/scripts/posix/activate.csh
b/Lib/venv/scripts/posix/activate.csh
index 9caf138a919a86..c707f1988b0acc 100644
--- a/Lib/venv/scripts/posix/activate.csh
+++ b/Lib/venv/scripts/posix/activate.csh
@@ -19,7 +19,7 @@ setenv VIRTUAL_ENV_PROMPT "__VENV_PROMPT__"
set _OLD_VIRTUAL_PROMPT="$prompt"
if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then
- set prompt = "__VENV_PROMPT__$prompt"
+ set prompt = "(__VENV_PROMPT__) $prompt"
endif
alias pydoc python -m pydoc
diff --git a/Lib/venv/scripts/posix/activate.fish
b/Lib/venv/scripts/posix/activate.fish
index 565df23d1e2a13..25c42756789bbc 100644
--- a/Lib/venv/scripts/posix/activate.fish
+++ b/Lib/venv/scripts/posix/activate.fish
@@ -57,7 +57,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
set -l old_status $status
# Output the venv prompt; color taken from the blue of the Python logo.
- printf "%s%s%s" (set_color 4B8BBE) "__VENV_PROMPT__" (set_color normal)
+ printf "%s(%s)%s " (set_color 4B8BBE) "__VENV_PROMPT__" (set_color
normal)
# Restore the return status of the previous command.
echo "exit $old_status" | .
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
