Add pydoc function for fish

Correct pydoc function for sh

3 files changed, 22 insertions, 17 deletions

diff --git a/virtualenv.py b/virtualenv.py
index 28f9dea..1b10996 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -2035,26 +2035,26 @@ CR+VlrFtOdyh1wQXwznkgMYOgbYN5b2an/5ETHuncS4lhrhilZ4sdXf1bEJKbHsOpaVXSh2S1aF8
 JVJrNlPJtFGzlxK6Q+nJaEzH/fMBpZ8zWLmPC97bhrAFMyukImupVde7gu5pLEtrp013jyJWudSe
 ySnl25+O3P7J2YBeXE7OL6Y1Y+4awZ6WOyjJ6Ky31UxzmIJCowfrPXasw7cZMVRYRR/emLGAgi0Q
 rislv3ZujmC7MxuCJUPbOzfhnP1FULFEOxJiwULOVDroLX2u3ylgoUTmbyxViaSMKHUilB4PDqqZ
-CEnhxT8KrtEzITNoBLQXWTKn9c1JHfwms+8N5t4rZ95r5t1zs84I9g/gIFto
+CEnhxT/KcmNmjID2IsvjtL45qXnfZOy9wch75bh7zah7bswZrf4B7cdZow==
 """)
 
 ##file activate.fish
 ACTIVATE_FISH = convert("""
-eJyFVWFv2zYQ/a5fcZUdOClqBftaoBjSxkMMJHHguAGGYaBp6RRzo0mNpJRm6I/vUbYkylZTfbAh
-8t3dI++90whWW2EhFxJhV1oHG4TSYkY/Qj3DOoGNUJc8daLiDpNc2O0a3r8ItxUKOJhSKY/z63AO
-W+eKj5eX/s1uUcok1Tu4AIvWCq3eJ9EIrjUo7XwgCAeZMJg6+ZpEUV4qqqIVZNiUg2kGk9k3wlXC
-uJJLVBXsdIbAVQYGXWkUOA1ui5TU7LgEQgij1Q6VSyYR0DMioEUHWmbhLlTcCL6RaGuUyMEhHX+q
-IB6zxe01e5ovV1+vbtnD1eomrjH+8Zmmz9/Ar8IpsI9DGAagyqJfVf1zdbO4v1nczQZqt3vHDNqN
-t3n0YW+w+WP+eMMelou7hxVbPM2Wy/l1wGcEj5SdK8Bd4V5B6pQasB777rOmm6zgjhRDTeJS6pe6
-VQZ3uiKozmFdgwujKcO60VwTa4n5OukfRcJp+ihgNDPcYiCXiT2qsVeOddpgTUYb8SwUl12dsDwE
-sUOAFBjpigWoX0XgScRgr4Zuvt+tA7pp6uz+qd/FeMzNc/XXb3/H8O4TTJRWGS2b0nsLJ70mynza
-7L0b5tx5siVRExnBV+WJCGNQYsVDXyVR4OR++ShqtBzQh5ix4JWxuIOd+AjGtZt6dozHQfglY5/n
-9+z+6m5GmQ7wlu963Jlg7a+MFpNo/w/T/+DIIsM0AhsO4THMUt9Wa7D/+1zZ9fzx6vPt7NDw+DC3
-vujitdZoWtL10tX2ldwOTE4aPxbVwTc9qYYqPRFhDz4oYlIKr7BHaGwdd6X9ALk2YYwlFPfT3RaS
-v9KgP3GxL78PbpKELn7Yk9QVGiNo3FPWiv6z3wPMPPcfkg/wj/9qFQYLuuKaXDjkFd9hVzsccJ3W
-Di5j3WDzT2GEcjlMzuyZnQzC4ZzOwlIt6ez7r89FmwGlxZ+kO/cZL84sTAYShEvTDWwkT/+FqYaX
-rXBIuxuabv5Mff3EF29yaSbG/t6WA8Ov7UEbk241xOg/veOuVTF8B6tLk3ZnGxxm/RnV+GZopB2d
-o7bJD4i7oRk=
+eJyFVVFv0zAQfs+vONJO3RDNxCsSQoMVrdK2Tl2ZhBBy3eSyGBw72E62In48dtokThtGH1rV/u7u
+O999dyNYZUxDyjhCXmoDG4RSY2K/mHiEdQQbJs5pbFhFDUYp09kaXj8xkzEBFFQphMO5cziFzJji
+3fm5+6cz5DyKZQ5noFFrJsXrKBjBpQQhjTMEZiBhCmPDt1EQpKWwUaSABJtwME1gMnu2uIopU1KO
+ooJcJghUJKDQlEqAkWAytE5VTjlYBFNS5ChMNAnAfkYWqNGA5Il/CxVVjG446hrFUjBo058KCMdk
+cX1JHubL1ZeLa3J3sboKa4z7OE/Tx2dwp3AM7OMQhgEokuB/Ub+urha3V4ub2UDs9u6QQXvxMo8+
+7AU2n+f3V+Ruubi5W5HFw2y5nF96fEZwb71TAZgXZgtcxrYA67GrPmmqSQpqbMfYIlHO5VNdKoW5
+rCxUprCuwYWS1sO66bnGVlvm66ifCodj94HHaKaoRq9dJvogxq5ztJEKazJSsUcmKO/i+OHBsx0C
+xEBsXxEP9T8LPLIYrNXQy/ertUc3RZ3dPvSrGI6peqy+vf0ewqv3MBFSJPZYlU5bOOkVkafT5u7V
+MOdim8h4+KqTa8uv5jiCL8JxZEohx4r6kosCT+R9ZkHQtLmXGYSEeH8JCTvYkcRgXAutp9Rw7Jmf
+E/JxfktuL25m1tMe3vJdjzt9rN1r2sMo2P3C9BccqGeYhqfQITz6XurXaqdf99LF1mT2YJrvzqCu
+5w7dKvV3PzNyOb+/+Hg923dOuB+An2SxrZs9Lm0xbCH6kmhjUyuWw+7cC7DX8367H3VzDz6oBtty
+tMIeobE21JT6DaRS+TbaoqhbE7rgdGs3xtE4cOF3xo0Tfxzc7UjKCpVidm9Yr5X9TT54mHnqNtIb
++OHWX6GwsE9ck/O3haA5drH9Sdl15l6upJuQdRkVEyaFyYk+0ZNBOJzaXEgsuc19t8bOWg/INf7D
+3anzeHaiYTLgwD+abmDDafwTphKeMmbQ3m7smHQ59fsnPHuRSzN6du+2HJiibQ1amziTEKLb4eOu
+VCH8AS1LFXe5DU7F/rBrVDY0Gw/yqGXyFxUuuAA=
 """)
 
 ##file activate.csh
diff --git a/virtualenv_embedded/activate.fish b/virtualenv_embedded/activate.fish
index f8610b9..aaf6082 100644
--- a/virtualenv_embedded/activate.fish
+++ b/virtualenv_embedded/activate.fish
@@ -28,6 +28,7 @@ function deactivate -d 'Exit virtualenv mode and return to the normal environmen
 
     if test "$argv[1]" != 'nondestructive'
         # Self-destruct!
+        functions -e pydoc
         functions -e deactivate
     end
 end
@@ -46,6 +47,10 @@ if set -q PYTHONHOME
     set -e PYTHONHOME
 end
 
+function pydoc
+    python -m pydoc $argv
+end
+
 if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
     # Copy the current `fish_prompt` function as `_old_fish_prompt`.
     functions -c fish_prompt _old_fish_prompt
diff --git a/virtualenv_embedded/activate.sh b/virtualenv_embedded/activate.sh
index f150896..4dff986 100644
--- a/virtualenv_embedded/activate.sh
+++ b/virtualenv_embedded/activate.sh
@@ -66,7 +66,7 @@ fi
 alias pydoc 2>/dev/null >/dev/null && unalias pydoc
 
 pydoc () {
-    exec python -m pydoc "$@"
+    python -m pydoc "$@"
 }
 
 # This should detect bash and zsh, which have a hash command that must