Fix paths.

klen · klen · commit 2d906ce40c52 · 2012-04-11T00:48:02.000+04:00
diff --git a/autoload/pymode/virtualenv.vim b/autoload/pymode/virtualenv.vim
@@ -13,6 +13,8 @@ fun! pymode#virtualenv#Activate() "{{{
     call add(g:pymode_virtualenv_enabled, $VIRTUAL_ENV)
 
 python << EOF
+import sys, vim, os
+
 ve_dir = os.environ['VIRTUAL_ENV']
 ve_dir in sys.path or sys.path.insert(0, ve_dir)
 activate_this = os.path.join(os.path.join(ve_dir, 'bin'), 'activate_this.py')
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -19,19 +19,6 @@ if !has('python')
     let g:pymode_virtualenv = 0
 endif
 
-" DESC: Fix python path
-if !pymode#Default('g:pymode_path', 1) || g:pymode_path
-python << EOF
-import sys, vim, os, StringIO
-
-curpath = vim.eval("getcwd()")
-libpath = os.path.join(os.path.dirname(os.path.dirname(
-    vim.eval("expand('<sfile>:p')"))), 'pylibs')
-
-sys.path = [libpath, curpath] + sys.path
-EOF
-endif
-
 
 " Virtualenv {{{
 
@@ -47,6 +34,20 @@ endif
 " }}}
 
 
+" DESC: Fix python path
+if !pymode#Default('g:pymode_path', 1) || g:pymode_path
+python << EOF
+import sys, vim, os
+
+curpath = vim.eval("getcwd()")
+libpath = os.path.join(os.path.dirname(os.path.dirname(
+    vim.eval("expand('<sfile>:p')"))), 'pylibs')
+
+sys.path = [libpath, curpath] + sys.path
+EOF
+endif
+
+
 " Lint {{{
 
 if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
