mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[3.10] gh-93858: Prevent error when activating venv in nested fish instances (GH-93931) (GH-98403)

Browse source 
Co-authored-by: Thomas B. Brunner <thomasbbrunner@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-10-18 08:39:06 -07:00 • committed by GitHub
parent 676cdea18f
commit ce87ab4dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/venv/scripts/posix/activate.fish
View file

@ -13,10 +13,13 @@ function deactivate -d "Exit virtual environment and return to normal shell env
end
if test -n "$_OLD_FISH_PROMPT_OVERRIDE"
functions -e fish_prompt
set -e _OLD_FISH_PROMPT_OVERRIDE
functions -c _old_fish_prompt fish_prompt
functions -e _old_fish_prompt
# prevents error when using nested fish instances (Issue #93858)
if functions -q _old_fish_prompt
functions -e fish_prompt
functions -c _old_fish_prompt fish_prompt
functions -e _old_fish_prompt
end
end
set -e VIRTUAL_ENV

1
Misc/NEWS.d/next/Library/2022-06-17-12-02-30.gh-issue-93858.R49ARc.rst Normal file
View file

@ -0,0 +1 @@
Prevent error when activating venv in nested fish instances.