https://hg.python.org/cpython/rev/4fc0154ec84a changeset: 102235:4fc0154ec84a branch: 3.5 parent: 102233:324b061ce220 user: Brett Cannon <brett@python.org> date: Thu Jun 30 11:41:55 2016 -0700 summary: Issue #26665: Remove mis-use of ``$`` in activate.fish. This is a revertion of cfc66e37eb8e. Thanks to 鄭景文 for the bug report. Thanks to Tin Tvrtković, Xiang Zhang, and Dan McCombs for diagnosing the issue. files: Lib/venv/scripts/posix/activate.fish | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish --- a/Lib/venv/scripts/posix/activate.fish +++ b/Lib/venv/scripts/posix/activate.fish @@ -55,8 +55,8 @@ # with the original prompt function renamed, we can override with our own. function fish_prompt # Prompt override? - if test -n "$__VENV_PROMPT__" - printf "%s%s%s" "$__VENV_PROMPT__" (set_color normal) (_old_fish_prompt) + if test -n "__VENV_PROMPT__" + printf "%s%s%s" "__VENV_PROMPT__" (set_color normal) (_old_fish_prompt) return end # ...Otherwise, prepend env diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ Library ------- +- Issue #26664: Fix activate.fish by removing mis-use of ``$``. + - Issue #22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong mode no longer break tracing, trace_vinfo() now always returns a list of pairs of strings, tracing in the "u" mode now works. -- Repository URL: https://hg.python.org/cpython