1 files changed, 39 insertions, 4 deletions
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index f754ea261..276eb6f91 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,15 +1,50 @@
+# python command
+alias py='python'
+
 # Find python file
 alias pyfind='find . -name "*.py"'
 
-# Remove python compiled byte-code and mypy cache in either current directory or in a
-# list of specified directories
+# Remove python compiled byte-code and mypy/pytest cache in either the current
+# directory or in a list of specified directories (including sub directories).
 function pyclean() {
     ZSH_PYCLEAN_PLACES=${*:-'.'}
     find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
     find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
-    find ${ZSH_PYCLEAN_PLACES} -type d -name ".mypy_cache" -delete
+    find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".mypy_cache" -exec rm -r "{}" +
+    find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".pytest_cache" -exec rm -r "{}" +
+}
+
+# Add the user installed site-packages paths to PYTHONPATH, only if the
+#   directory exists. Also preserve the current PYTHONPATH value.
+# Feel free to autorun this when .zshrc loads.
+function pyuserpaths() {
+    local targets=("python2" "python3")  # bins
+    
+    # Get existing interpreters.
+    local interps=()
+    for target in $targets; do
+        [ `command -v $target` ] && interps+=($target)
+    done
+
+    # Check for a non-standard install directory.
+    local user_base="${HOME}/.local"
+    [ $PYTHONUSERBASE ] && user_base=$PYTHONUSERBASE
+
+    # Add version specific paths, if:
+    #   it exists in the filesystem;
+    #   it isn't in PYTHONPATH already.
+    for interp in $interps; do
+        # Get minor release version.
+        local ver=`$interp -V 2>&1`
+        ver=`echo ${ver:7} | cut -d '.' -f 1,2`  # The patch version is variable length, truncate it.
+        
+        local site_pkgs="${user_base}/lib/python${ver}/site-packages"
+        [[ -d $site_pkgs && ! $PYTHONPATH =~ $site_pkgs ]] && export PYTHONPATH=${site_pkgs}:$PYTHONPATH
+    done
 }
 
 # Grep among .py files
-alias pygrep='grep --include="*.py"'
+alias pygrep='grep -nr --include="*.py"'
 
+# Run proper IPython regarding current virtualenv (if any)
+alias ipython="python -c 'import IPython; IPython.terminal.ipapp.launch_new_instance()'"