python: only override virtualenvwrapper python when needed

Fixes sorin-ionescu#1519
rooney · Dec 13, 2017 · d76b2f3 · d76b2f3
1 parent 7d77c7b
commit d76b2f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
@@ -115,16 +115,16 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
     # Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if available
     # in '$path' or in an alternative location on a Debian based system.
     #
-    # If the python-path was manually specified, use that. Otherwise, fall back
-    # to python3 then python2 in that order. This is needed to fix an issue with
-    # virtualenvwrapper when used with homebrew, as it no longer shadows the
-    # system python.
+    # If the python-path was manually specified, use that. Otherwise, if
+    # homebrew is installed we fall back to python3 then python2 in that
+    # order. This is needed to fix an issue with virtualenvwrapper as homebrew
+    # no longer shadows the system python.
     zstyle -s ':prezto:module:python:virtualenvwrapper' python-path '_venv_python'
     if [[ -n "$_venv_python" ]]; then
       export VIRTUALENVWRAPPER_PYTHON=$_venv_python
-    elif (( $+commands[python3] )); then
+    elif (( $+commands[brew] )) && (( $+commands[python3] )); then
       export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
-    elif (( $+commands[python2] )); then
+    elif (( $+commands[brew] )) && (( $+commands[python2] )); then
       export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
     fi
+4 −0		CHANGELOG.md
+1 −0		Makefile
+2 −0		README.md
+1 −1		VERSION
+3 −3		circle.yml
+12 −2		src/strategies/default.zsh
+10 −3		src/strategies/match_prev_cmd.zsh
+11 −0		src/util.zsh
+34 −6		zsh-autosuggestions.zsh