v20140615 (fixes #26)

README.md

@@ -86,9 +86,9 @@ virtualenv will be created with given name based on current
 version.
 
 ```
-  $ pyenv version
-  3.4.1 (set by /home/yyuu/.pyenv/version)
-  $ pyenv virtualenv venv34
+$ pyenv version
+3.4.1 (set by /home/yyuu/.pyenv/version)
+$ pyenv virtualenv venv34
 ```
 
 
@@ -128,6 +128,11 @@ You can set certain environment variables to control the pyenv-virtualenv.
 
 ## Version History
 
+#### 20140615
+
+ * Fix incompatibility issue of `pyenv activate` and `pyenv deactivate` (#26)
+ * Workaround for the issue with pyenv-which-ext (#26)
+
 #### 20140614
 
  * Add `pyenv virtualenv-init` to enable auto-activation feature (#24)

bin/pyenv-sh-activate

@@ -33,6 +33,12 @@ if [ -z "$versions" ]; then
   IFS="$OLDIFS"
 fi
 
+if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
+  # Backward compatibility issue
+  # https://github.com/yyuu/pyenv-virtualenv/issues/26
+  no_shell=
+fi
+
 if [ "${#versions[@]}" -gt 1 ]; then
   echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
   exit 1

bin/pyenv-sh-deactivate

@@ -11,6 +11,12 @@ set -e
 
 shell="$(basename "${PYENV_SHELL:-$SHELL}")"
 case "$shell" in
-fish ) echo "functions -q deactivate; and deactivate";;
-*    ) echo "declare -f deactivate 1>/dev/null 2>&1 && deactivate";;
+fish ) echo "functions -q deactivate; and deactivate;";;
+*    ) echo "declare -f deactivate 1>/dev/null 2>&1 && deactivate;";;
 esac
+
+if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
+  # Backward compatibility issue
+  # https://github.com/yyuu/pyenv-virtualenv/issues/26
+  echo "pyenv shell --unset"
+fi

bin/pyenv-virtualenv

@@ -11,7 +11,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20140614"
+PYENV_VIRTUALENV_VERSION="20140615"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -124,10 +124,12 @@ usage() {
 }
 
 detect_venv() {
-  if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
+  # Check the existence of executables as a workaround for the issue with pyenv-which-ext
+  # https://github.com/yyuu/pyenv-virtualenv/issues/26
+  if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
     HAS_VIRTUALENV=1
   fi
-  if pyenv-which "pyvenv" 1>/dev/null 2>&1; then
+  if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
     HAS_PYVENV=1
   fi
   # Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given

bin/pyenv-virtualenv-init

@@ -65,6 +65,7 @@ fi
 case "$shell" in
 bash )
   cat <<EOS
+export PYENV_VIRTUALENV_INIT=1
 _pyenv_virtualenv_hook() {
   if [[ "\$(pyenv version-name)" == "system" ]]; then
     pyenv deactivate || true;
@@ -80,6 +81,7 @@ EOS
   ;;
 fish )
   cat <<EOS
+setenv PYENV_VIRTUALENV_INIT=1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ (pyenv version-name) = "system" ]
     eval (pyenv sh-deactivate); or true
@@ -92,6 +94,7 @@ EOS
   ;;
 zsh )
   cat <<EOS
+export PYENV_VIRTUALENV_INIT=1
 _pyenv_virtualenv_hook() {
   if [[ "\$(pyenv version-name)" == "system" ]]; then
     pyenv deactivate || true

test/activate.bats

@@ -8,6 +8,8 @@ setup() {
 }
 
 @test "activate virtualenv from current version" {
+  export PYENV_VIRTUALENV_INIT=1
+
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -24,7 +26,29 @@ source "${PYENV_ROOT}/versions/venv/bin/activate"
 EOS
 }
 
+@test "activate virtualenv from current version (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  stub pyenv-version-name "echo venv"
+  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv";
+source "${PYENV_ROOT}/versions/venv/bin/activate"
+EOS
+}
+
 @test "activate virtualenv from current version (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -41,7 +65,47 @@ EOS
 EOS
 }
 
+@test "activate virtualenv from current version (fish) (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  stub pyenv-version-name "echo venv"
+  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+
+  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv";
+. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
+EOS
+}
+
 @test "activate virtualenv from command-line argument" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  run pyenv-sh-activate "venv27"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv27";
+source "${PYENV_ROOT}/versions/venv27/bin/activate"
+EOS
+}
+
+@test "activate virtualenv from command-line argument (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 

test/deactivate.bats

@@ -7,20 +7,48 @@ setup() {
 }
 
 @test "deactivate virtualenv" {
+  export PYENV_VIRTUALENV_INIT=1
+
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-declare -f deactivate 1>/dev/null 2>&1 && deactivate
+declare -f deactivate 1>/dev/null 2>&1 && deactivate;
+EOS
+}
+
+@test "deactivate virtualenv (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+declare -f deactivate 1>/dev/null 2>&1 && deactivate;
+pyenv shell --unset
 EOS
 }
 
 @test "deactivate virtualenv (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+
   PYENV_SHELL="fish" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-functions -q deactivate; and deactivate
+functions -q deactivate; and deactivate;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+functions -q deactivate; and deactivate;
+pyenv shell --unset
 EOS
 }
 

test/hooks.bats

@@ -13,14 +13,16 @@ setup() {
 before_virtualenv 'echo before: \$VIRTUALENV_PATH'
 after_virtualenv 'echo after: \$STATUS'
 OUT
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
-  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
-                   "pyvenv : false"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
   stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.2.1 \"\$@\""
   stub pyenv-rehash "echo rehashed"
 
-  mkdir -p "${PYENV_ROOT}/versions/3.2.1"
+  create_executable "3.2.1" "virtualenv"
+  remove_executable "3.2.1" "pyvenv"
+
   run pyenv-virtualenv "3.2.1" venv
 
   assert_success

test/pyvenv.bats

@@ -9,7 +9,7 @@ setup() {
 stub_pyenv() {
   export PYENV_VERSION="$1"
   stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
   stub pyenv-rehash " : echo rehashed"
 }
@@ -22,68 +22,64 @@ unstub_pyenv() {
   unstub pyenv-rehash
 }
 
-create_executable() {
-  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
-  touch "${PYENV_ROOT}/versions/$1/bin/$2"
-  chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
-}
-
-remove_executable() {
-  rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
-  
-}
-
 @test "use pyvenv if virtualenv is not available" {
-  stub_pyenv "3.4.0"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
+  stub_pyenv "3.4.1"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip"
   stub pyenv-exec "echo 3.4"
 
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
   run pyenv-virtualenv venv
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
 PYENV_VERSION=venv ensurepip
 rehashed
 OUT
   assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
 }
 
 @test "not use pyvenv if virtualenv is available" {
-  stub_pyenv "3.4.0"
-  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv"
+  stub_pyenv "3.4.1"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo 3.4"
 
+  create_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
   run pyenv-virtualenv venv
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
 }
 
 @test "install virtualenv if pyvenv is not avaialble" {
   stub_pyenv "3.2.1"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : false"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo 3.2"
 
+  remove_executable "3.2.1" "virtualenv"
+  remove_executable "3.2.1" "pyvenv"
+
   run pyenv-virtualenv venv
 
   assert_success
@@ -94,62 +90,68 @@ rehashed
 OUT
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
 }
 
 @test "install virtualenv if -p has given" {
-  stub_pyenv "3.4.0"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
+  stub_pyenv "3.4.1"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo 3.4"
 
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
   run pyenv-virtualenv -p python3 venv
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 pip install virtualenv
-PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
 }
 
 @test "install virtualenv if --python has given" {
-  stub_pyenv "3.4.0"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
+  stub_pyenv "3.4.1"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo 3.4"
 
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
   run pyenv-virtualenv --python=python3 venv
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 pip install virtualenv
-PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
 }
 
 @test "install virtualenv with unsetting troublesome pip options" {
   stub_pyenv "3.2.1"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : false"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo 3.2"
 
+  remove_executable "3.2.1" "virtualenv"
+  remove_executable "3.2.1" "pyvenv"
+
   PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv
 
   assert_success
@@ -160,14 +162,13 @@ rehashed
 OUT
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
 }
 
 @test "install pip without using ensurepip" {
-  stub_pyenv "3.3.0"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
+  stub_pyenv "3.3.5"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-which "pip : echo no pip; false"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false"
@@ -178,11 +179,14 @@ OUT
   stub curl "echo ez_setup.py"
   stub curl "echo get_pip.py"
 
+  remove_executable "3.3.5" "virtualenv"
+  create_executable "3.3.5" "pyvenv"
+
   run pyenv-virtualenv venv
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.3.0 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
 PYENV_VERSION=venv no ensurepip
 PYENV_VERSION=venv setuptools
 PYENV_VERSION=venv pip

test/test_helper.bash

@@ -96,3 +96,13 @@ assert_output_contains() {
     } | flunk
   }
 }
+
+create_executable() {
+  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
+  touch "${PYENV_ROOT}/versions/$1/bin/$2"
+  chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
+}
+
+remove_executable() {
+  rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
+}

test/version.bats

@@ -4,34 +4,40 @@ load test_helper
 
 setup() {
   export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20140614"
+  export PYENV_VIRTUALENV_VERSION="20140615"
 }
 
 @test "display virtualenv version" {
-  stub pyenv-which "virtualenv : true"
-  stub pyenv-which "pyvenv : true"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
   stub pyenv-exec "virtualenv --version : echo \"1.11\""
 
-  run pyenv-virtualenv --version
+  create_executable "2.7.7" "virtualenv"
+  remove_executable "2.7.7" "pyvenv"
 
-  unstub pyenv-which
-  unstub pyenv-exec
+  run pyenv-virtualenv --version
 
   assert_success
   assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
+
+  unstub pyenv-prefix
+  unstub pyenv-exec
 }
 
 @test "display pyvenv version" {
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\""
-  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\""
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
+  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.4.1/bin/pyvenv\""
   stub pyenv-root "echo \"${PYENV_ROOT}\""
 
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
   run pyenv-virtualenv --version
 
-  unstub pyenv-which
-  unstub pyenv-root
-
   assert_success
-  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.3.3)"
+  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.4.1)"
+
+  unstub pyenv-prefix
+  unstub pyenv-root
 }

test/virtualenv.bats

@@ -8,9 +8,13 @@ setup() {
 
 stub_pyenv() {
   export PYENV_VERSION="$1"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
-  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'"
-  stub pyenv-which "pyvenv : false"
+
+  create_executable "${PYENV_VERSION}" "virtualenv"
+  remove_executable "${PYENV_VERSION}" "pyvenv"
+
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
   stub pyenv-rehash " : echo rehashed"
 }
@@ -18,7 +22,6 @@ stub_pyenv() {
 unstub_pyenv() {
   unset PYENV_VERSION
   unstub pyenv-prefix
-  unstub pyenv-which
   unstub pyenv-hooks
   unstub pyenv-rehash
 }