Allow unfunctioing pydoc to fail (#2049)

pypa · Jan 12, 2021 · 26943f6 · 26943f6
1 parent a4025d6
commit 26943f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/changelog/2049.bugfix.rst b/docs/changelog/2049.bugfix.rst
@@ -0,0 +1,4 @@
+Allow unfunctioning of pydoc to fail freely so that virtualenvs can be
+activated under Zsh with set -e (since otherwise ``unset -f`` and
+``unfunction`` exit with 1 if the function does not exist in Zsh) - by
+:user:`d125q`.
diff --git a/src/virtualenv/activation/bash/activate.sh b/src/virtualenv/activation/bash/activate.sh
@@ -8,7 +8,7 @@ if [ "${BASH_SOURCE-}" = "$0" ]; then
 fi
 
 deactivate () {
-    unset -f pydoc >/dev/null 2>&1
+    unset -f pydoc >/dev/null 2>&1 || true
 
     # reset old environment variables
     # ! [ -z ${VAR+_} ] returns true if VAR is declared at all