Version 0.5.7

klen · klen · commit c24fa9aa9ad0 · 2012-02-11T00:19:46.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## 2012-02-11 0.5.7
+-------------------
+* Fix 'g:pymode_lint_message' mode error
+* Fix breakpoints
+* Fix python paths and virtualenv detection
+
 ## 2012-02-06 0.5.6
 -------------------
 * Fix 'g:pymode_syntax' option
diff --git a/README.rst b/README.rst
@@ -28,13 +28,11 @@ See (old) screencast here: http://t.co/3b0bzeXA (sorry for quality, this is my f
 Changelog
 =========
 
-## 2012-02-06 0.5.6
+## 2012-02-11 0.5.7
 -------------------
-* Fix 'g:pymode_syntax' option
-* Show error message in bottom part of screen
-  see 'g:pymode_lint_message'
-* Fix pylint for windows users
-* Fix breakpoint command (Use pdb when idpb not installed)
+* Fix 'g:pymode_lint_message' mode error
+* Fix breakpoints
+* Fix python paths and virtualenv detection
 
 
 Requirements
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -43,22 +43,6 @@ endif
 " }}}
 
 
-" Paths {{{
-
-" Fix path for project
-if g:pymode
-    py curpath = vim.eval('getcwd()')
-    py curpath in sys.path or sys.path.append(curpath)
-endif
-
-" Add virtualenv paths
-if g:pymode_virtualenv && exists("$VIRTUAL_ENV")
-    call pymode#virtualenv#Activate()
-endif
-
-" }}}
-
-
 " Documentation {{{
 
 if g:pymode_doc
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,4 +1,4 @@
-let g:pymode_version = "0.5.6"
+let g:pymode_version = "0.5.7"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 
@@ -21,16 +21,31 @@ endif
 " DESC: Fix python path
 if !pymode#Default('g:pymode_path', 1) || g:pymode_path
 python << EOF
-import sys, vim
-from os import path as op
+import sys, vim, os
 
-sys.path = [
-    op.join(op.dirname(op.dirname(vim.eval("expand('<sfile>:p')"))),
-    'pylibs'), vim.eval("getcwd()") ] + sys.path
+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 {{{
+
+if !pymode#Default("g:pymode_virtualenv", 1) || g:pymode_virtualenv
+
+    call pymode#Default("g:pymode_virtualenv_enabled", [])
+
+    " Add virtualenv paths
+    call pymode#virtualenv#Activate()
+
+endif
+
+" }}}
+
+
 " Lint {{{
 
 if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
@@ -160,27 +175,6 @@ endif
 " }}}
 
 
-" Breakpoints {{{
-
-if !pymode#Default("g:pymode_breakpoint", 1) || g:pymode_breakpoint
-
-    if !pymode#Default("g:pymode_breakpoint_cmd", "import ipdb; ipdb.set_trace() ### XXX BREAKPOINT")  && has("python")
-python << EOF
-try:
-    import ipdb
-except ImportError:
-    vim.command('let g:pymode_breakpoint_cmd = "import pdb; pdb.set_trace() ### XXX BREAKPOINT"')
-EOF
-    endif
-
-    " OPTION: g:pymode_breakpoint_key -- string. Key for set/unset breakpoint.
-    call pymode#Default("g:pymode_breakpoint_key", "<leader>b")
-
-endif
-
-" }}}
-
-
 " Documentation {{{
 
 if !pymode#Default("g:pymode_doc", 1) || g:pymode_doc
@@ -197,11 +191,21 @@ endif
 " }}}
 
 
-" Virtualenv {{{
+" Breakpoints {{{
 
-if !pymode#Default("g:pymode_virtualenv", 1) || g:pymode_virtualenv
+if !pymode#Default("g:pymode_breakpoint", 1) || g:pymode_breakpoint
 
-    call pymode#Default("g:pymode_virtualenv_enabled", [])
+    if !pymode#Default("g:pymode_breakpoint_cmd", "import ipdb; ipdb.set_trace() ### XXX BREAKPOINT")  && has("python")
+python << EOF
+try:
+    import ipdb
+except ImportError:
+    vim.command('let g:pymode_breakpoint_cmd = "import pdb; pdb.set_trace() ### XXX BREAKPOINT"')
+EOF
+    endif
+
+    " OPTION: g:pymode_breakpoint_key -- string. Key for set/unset breakpoint.
+    call pymode#Default("g:pymode_breakpoint_key", "<leader>b")
 
 endif
 
