Fix venv activate.fish to maintain $status

[Lucretiel]

BPO	25671
Nosy	@vsajip, @matrixise
Files	patch.diff patch.diff

^{Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.}

Show more details

GitHub fields:

assignee = None
closed_at = <Date 2016-09-11.11:53:43.394>
created_at = <Date 2015-11-19.15:24:50.163>
labels = ['type-feature', 'library']
title = 'Fix venv activate.fish to maintain $status'
updated_at = <Date 2016-09-11.11:53:43.392>
user = 'https://bugs.python.org/Lucretiel'

bugs.python.org fields:

activity = <Date 2016-09-11.11:53:43.392>
actor = 'python-dev'
assignee = 'none'
closed = True
closed_date = <Date 2016-09-11.11:53:43.394>
closer = 'python-dev'
components = ['Library (Lib)']
creation = <Date 2015-11-19.15:24:50.163>
creator = 'Lucretiel'
dependencies = []
files = ['41079', '41103']
hgrepos = []
issue_num = 25671
keywords = ['patch']
message_count = 5.0
messages = ['254906', '255010', '255019', '260370', '275775']
nosy_count = 4.0
nosy_names = ['vinay.sajip', 'python-dev', 'matrixise', 'Lucretiel']
pr_nums = []
priority = 'normal'
resolution = 'fixed'
stage = 'resolved'
status = 'closed'
superseder = None
type = 'enhancement'
url = 'https://bugs.python.org/issue25671'
versions = ['Python 3.5', 'Python 3.6']

[Lucretiel]

Many fish_prompts use display the $status (fish's equivalent to $?) somewhere in the prompt. Currently, venv's activate.fish overwrites and wraps the user's fish_prompt, the wrapping doesn't preserve this $status. This patch ensures that the $status is correctly restored before invoking the user's fish_prompt.

This is based on my similar work in virtualenv, at pypa/virtualenv#799

[Lucretiel]

Fixed an issue where fish_prompt was returning before calling _old_fish_prompt

[matrixise]

I am a user of fish.

The use case is just execute python -mvenv demo
source demo/bin/activate.fish

check the status and deactivate the virtualenv ?

do you confirm ?

Thank you

[Lucretiel]

Not quite, no. The issue looks like this:

user@host ~/test> python3 -mvenv env
user@host ~/test> true
user@host ~/test> false
user@host ~/test [1]> source env/bin/activate.fish 
(env) user@host ~/test> true
(env) user@host ~/test> false
(env) user@host ~/test> deactivate
user@host ~/test> true
user@host ~/test> false
user@host ~/test [1]>

Notice that, after running the false command the first time, the command prompt includes a "[1]", indicating the exit status of the false command. However, after activating the virtual environment, the command prompt no longer shows the error code from the false command. After deactivating the virtualenv, the command prompt once again displays the error code from false.

[python-dev]

New changeset f6125944ffb8 by Vinay Sajip in branch '3.5':
Fixes bpo-25671: Updated prompt handling in activate.fish.
https://hg.python.org/cpython/rev/f6125944ffb8

New changeset ed34b93519ba by Vinay Sajip in branch 'default':
Closes bpo-25671: Merged fix from 3.5.
https://hg.python.org/cpython/rev/ed34b93519ba