[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5 for issue #26664

[brett.cannon]

https://hg.python.org/cpython/rev/8d7bde14d7a4
changeset:   102236:8d7bde14d7a4
parent:      102234:f2d1dba10a0e
parent:      102235:4fc0154ec84a
user:        Brett Cannon <brett at python.org>
date:        Thu Jun 30 11:43:19 2016 -0700
summary:
  Merge from 3.5 for issue #26664

files:
  Lib/venv/scripts/posix/activate.fish |  4 ++--
  1 files changed, 2 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

-- 
Repository URL: https://hg.python.org/cpython