Activate virtualenv manually.

klen · klen · commit 6e86135b6e84 · 2013-12-01T20:51:02.000+07:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -33,6 +33,9 @@ Changelog
     * Options added:
         'pymode_rope_regenerate_on_write', 'pymode_rope_completion', 'pymode_rope_complete_on_dot'
 
+    * Commands added:
+        'PymodeVirtualenv'
+
     * Commands changed:
         'PyDoc' -> 'PymodeDoc'
         'Pyrun' -> 'PymodeRun'
diff --git a/autoload/pymode/virtualenv.vim b/autoload/pymode/virtualenv.vim
@@ -10,3 +10,8 @@ fun! pymode#virtualenv#init() "{{{
     PymodePython enable_virtualenv()
 
 endfunction "}}}
+
+fun! pymode#virtualenv#activate(relpath) "{{{
+    let g:pymode_virtualenv_path = getcwd() . '/' . a:relpath
+    call pymode#virtualenv#init()
+endfunction "}}}
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -202,7 +202,11 @@ Bind keys to show documentation for current word (selection)
 2.6 Support virtualenv ~
                                                              *pymode-virtualenv*
 
-Enable virtualenv detection                              *'g:pymode_virtualenv'*
+Commands:
+*:PymodeVirtualenv* <path> -- Activate virtualenv (path is related to
+current working directory)
+
+Enable automatic virtualenv detection                     *'g:pymode_virtualenv'*
 >
     let g:pymode_virtualenv = 1
 
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -9,6 +9,8 @@ if !pymode#default('g:pymode_init', 1)
     call pymode#breakpoint#init()
 endif
 
+command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)
+
 " Setup events for pymode
 au pymode BufWritePre <buffer> call pymode#buffer_pre_write()
 au pymode BufWritePost <buffer> call pymode#buffer_post_write()
diff --git a/pymode/virtualenv.py b/pymode/virtualenv.py
@@ -3,9 +3,10 @@
 import os.path
 import vim # noqa
 
-from .utils import pymode_message
+from .utils import pymode_message, catch_and_print_exceptions
 
 
+@catch_and_print_exceptions
 def enable_virtualenv():
     """ Enable virtualenv for vim.
 
@@ -16,6 +17,7 @@ def enable_virtualenv():
     path = vim.eval('g:pymode_virtualenv_path')
     enabled = vim.eval('g:pymode_virtualenv_enabled')
     if path == enabled:
+        pymode_message('Virtualenv %s already enabled.' % path)
         return False
 
     activate_this = os.path.join(os.path.join(path, 'bin'), 'activate_this.py')
