Merge pull request #1981 from zbirenbaum/python_fix

Fix crash on open caused by incorrect conditional in python module

modules/python/init.zsh

@@ -114,33 +114,34 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) \
     pyenv_plugins=(${(@oM)${(f)"$(pyenv commands --no-sh 2> /dev/null)"}:#virtualenv*})
   fi
 
+  # Optionally activate 'virtualenv' plugin when available.
   if (( $pyenv_plugins[(i)virtualenv-init] <= $#pyenv_plugins )); then
-    # Enable 'virtualenv' with 'pyenv'.
     eval "$(pyenv virtualenv-init - zsh)"
+  fi
 
-    # Optionally activate 'virtualenvwrapper' plugin when available.
+  # Optionally activate 'virtualenvwrapper' plugin when available.
-    if (( $pyenv_plugins[(i)virtualenvwrapper(_lazy|)] <= $#pyenv_plugins )); then
+  if (( $pyenv_plugins[(i)virtualenvwrapper(_lazy|)] <= $#pyenv_plugins )); then
-      pyenv "$pyenv_plugins[(R)virtualenvwrapper(_lazy|)]"
+    pyenv "$pyenv_plugins[(R)virtualenvwrapper(_lazy|)]"
-    fi
+  fi
-  else
-    # Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if 'python' is
-    # available in '$path'.
-    if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $#commands[(i)python[23]#] )); then
-      VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
-    fi
   
-    virtenv_sources=(
+  unset pyenv_plugins
-      ${(@Ov)commands[(I)virtualenvwrapper(_lazy|).sh]}
-      /usr/share/virtualenvwrapper/virtualenvwrapper(_lazy|).sh(OnN)
-    )
-    if (( $#virtenv_sources )); then
-      source "$virtenv_sources[1]"
-    fi
   
-    unset virtenv_sources
+else
+  # Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if 'python' is
+  # available in '$path'.
+  if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $#commands[(i)python[23]#] )); then
+    VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
   fi
 
-  unset pyenv_plugins
+  virtenv_sources=(
+    ${(@Ov)commands[(I)virtualenvwrapper(_lazy|).sh]}
+    /usr/share/virtualenvwrapper/virtualenvwrapper(_lazy|).sh(OnN)
+  )
+  if (( $#virtenv_sources )); then
+    source "$virtenv_sources[1]"
+  fi
+
+  unset virtenv_sources
 fi
 
 # Load conda into the shell session, if requested.