(Re)activate python virtual environment

diff --git a/.shellrc b/.shellrc
index e21f720b580c5deaef3660a3006cf4946d716a6d..55dab97651ff1cc23ee5d3335e279863cbb08605 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -161,6 +161,10 @@ if test -n "$BASH_VERSION"; then
 
    source virtualenvwrapper_lazy.sh 2>/dev/null
 
+   #if [ -n "$VIRTUAL_ENV" ]; then
+   #   . "$VIRTUAL_ENV/bin/activate"
+   #fi
+
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - "$@"; }
    j() { jobs; }

diff --git a/.vimrc b/.vimrc
index bad48fd4e8def586b5ac01dab21382b489b99f61..852d3cb21fb0abe5c8ae7a1a37c151f762295f09 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -527,6 +527,19 @@ if exists("$SLOWTERM")
 endif
 
 
+if has("python")
+python << END_OF_PYTHON
+import sys, os
+
+virtualenv_dir = os.environ.get('VIRTUAL_ENV')
+if virtualenv_dir:
+    sys.path.insert(0, virtualenv_dir)
+    activate_this = os.path.join(virtualenv_dir, 'bin', 'activate_this.py')
+    execfile(activate_this, dict(__file__=activate_this))
+END_OF_PYTHON
+endif
+
+
 " ----------
 " From http://slobin.pp.ru/vim/_vimrc.html