Merge remote-tracking branch 'upstream/master'

modules/directory/init.zsh

@@ -25,5 +25,6 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 # Aliases
 #
 
+alias -- -='cd -'
 alias d='dirs -v'
 for index ({1..9}) alias "$index"="cd +${index}"; unset index

modules/python/init.zsh

@@ -8,6 +8,12 @@
 #   Indrajit Raychaudhuri <irc@indrajit.com>
 #
 
+#
+# Options
+#
+
+setopt EXTENDED_GLOB
+
 # Load dependencies.
 pmodload 'helper'
 
@@ -110,38 +116,42 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) \
   # look for plugins of interest. Scanning shell '$path' isn't enough as they
   # can exist in 'pyenv' synthesized paths (e.g., '~/.pyenv/plugins') instead.
   local -a pyenv_plugins
+  local pyenv_virtualenvwrapper_plugin_found
   if (( $+commands[pyenv] )); then
     pyenv_plugins=(${(@oM)${(f)"$(pyenv commands --no-sh 2> /dev/null)"}:#virtualenv*})
-  fi
 
-  # Optionally activate 'virtualenv' plugin when available.
+    # Optionally activate 'virtualenv-init' plugin when available.
-  if (( $pyenv_plugins[(i)virtualenv-init] <= $#pyenv_plugins )); then
+    if (( $pyenv_plugins[(i)virtualenv-init] <= $#pyenv_plugins )); then
-    eval "$(pyenv virtualenv-init - zsh)"
+      eval "$(pyenv virtualenv-init - zsh)"
-  fi
+    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
+      pyenv_virtualenvwrapper_plugin_found="true"
-  
+    fi
-  unset pyenv_plugins
+
-  
+    unset pyenv_plugins
-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=(
+  if [[ $pyenv_virtualenvwrapper_plugin_found != "true" ]]; then
-    ${(@Ov)commands[(I)virtualenvwrapper(_lazy|).sh]}
+    # Fallback to standard 'virtualenvwrapper' if 'python' is available in '$path'.
-    /usr/share/virtualenvwrapper/virtualenvwrapper(_lazy|).sh(OnN)
+    if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $#commands[(i)python[23]#] )); then
-  )
+      VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
-  if (( $#virtenv_sources )); then
+    fi
-    source "$virtenv_sources[1]"
+
+    virtualenvwrapper_sources=(
+      ${(@Ov)commands[(I)virtualenvwrapper(_lazy|).sh]}
+      /usr/share/virtualenvwrapper/virtualenvwrapper(_lazy|).sh(OnN)
+    )
+    if (( $#virtualenvwrapper_sources )); then
+      source "$virtualenvwrapper_sources[1]"
+    fi
+
+    unset virtualenvwrapper_sources
   fi
 
-  unset virtenv_sources
+  unset pyenv_virtualenvwrapper_plugin_found
 fi
 
 # Load conda into the shell session, if requested.