Fix pylint

klen · klen · commit 6b106e159610 · 2013-03-15T02:43:40.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.py[cod]
+.vimrc
 *.sw?
 *~
 .DS_Store
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -14,6 +14,7 @@ fun! pymode#lint#Check() "{{{
 
     let g:pymode_lint_buffer = bufnr('%')
 
+    py from pymode import lint
     py lint.check_file()
 
 endfunction " }}}
@@ -99,7 +100,9 @@ fun! pymode#lint#Auto() "{{{
             return 0
         endtry
     endif
+    py from pymode import auto
     py auto.fix_current_file()
     cclose
     edit
+    call pymode#WideMessage("AutoPep8 done.")
 endfunction "}}}
diff --git a/ftplugin/python/init-pymode.vim b/ftplugin/python/init-pymode.vim
@@ -50,7 +50,7 @@ import sys, vim, os
 curpath = vim.eval("getcwd()")
 libpath = os.path.join(vim.eval("expand('<sfile>:p:h:h:h')"), 'pylibs')
 
-sys.path = [os.path.dirname(libpath), libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
+sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
 EOF
 
 endif " }}}
@@ -130,7 +130,7 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
         let g:pymode_lint_config = expand("<sfile>:p:h:h") . "/pylint.ini"
     endif
 
-    py from pymode import lint, queue, auto
+    py from pymode import queue
 
     au VimLeavePre * py queue.stop_queue()
 
diff --git a/pylibs/autopep8.py b/pylibs/autopep8.py
@@ -44,7 +44,7 @@
 import difflib
 import tempfile
 
-from .pylama import pep8
+from pylama import pep8
 
 
 try:
diff --git a/pylibs/pymode/auto.py b/pylibs/pymode/auto.py
@@ -1,5 +1,5 @@
 import vim
-from pylibs.autopep8 import fix_file
+from autopep8 import fix_file
 
 
 class Options():
diff --git a/pylibs/ropevim.py b/pylibs/ropevim.py
@@ -4,9 +4,9 @@
 import tempfile
 import re
 
-from pylibs.ropemode import decorators
-from pylibs.ropemode import environment
-from pylibs.ropemode import interface
+from ropemode import decorators
+from ropemode import environment
+from ropemode import interface
 
 import vim
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`*.py[cod]`
	`2`	`+.vimrc`
`2`	`3`	`*.sw?`
`3`	`4`	`*~`
`4`	`5`	`.DS_Store`