Update pylama

klen · klen · commit e63911ff7e1e · 2013-08-30T23:49:40.000+07:00
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -74,9 +74,11 @@ if pymode#Option('lint')
     endif
 
     " DESC: Run queue
-    let &l:updatetime = g:pymode_updatetime
-    au CursorHold <buffer> call pymode#queue#Poll()
-    au BufLeave <buffer> Python queue.stop_queue()
+    if pymode#Option('lint_async')
+        let &l:updatetime = g:pymode_updatetime
+        au CursorHold <buffer> call pymode#queue#Poll()
+        au BufLeave <buffer> Python queue.stop_queue()
+    endif
 
 endif
 
diff --git a/pylibs/pylama/__init__.py b/pylibs/pylama/__init__.py
@@ -5,7 +5,7 @@
 
 """
 
-version_info = 1, 5, 0
+version_info = 1, 5, 2
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__
diff --git a/pylibs/pylama/checkers/mccabe.py b/pylibs/pylama/checkers/mccabe.py
@@ -265,12 +265,13 @@ def get_code_complexity(code, threshold=7, filename='stdin'):
     complx = []
     McCabeChecker.max_complexity = threshold
     for lineno, offset, text, check in McCabeChecker(tree, filename).run():
-        complx.append('%s:%d:1: %s' % (filename, lineno, text))
+        complx.append(dict(
+            type=McCabeChecker._code,
+            lnum=lineno,
+            text=text,
+        ))
 
-    if len(complx) == 0:
-        return 0
-    print('\n'.join(complx))
-    return len(complx)
+    return complx
 
 
 def get_module_complexity(module_path, threshold=7):
diff --git a/pylibs/pylama/config.py b/pylibs/pylama/config.py
@@ -23,6 +23,7 @@ def parse_options(
     :return argparse.Namespace:
 
     """
+    # Parse args from command string
     parser = get_parser()
     actions = dict((a.dest, a) for a in parser._actions)
     options = Options(
@@ -35,8 +36,10 @@ def parse_options(
     if not (args is None):
         options = parser.parse_args(args)
 
+    # Parse options from ini file
     config = get_config(str(options.options))
 
+    # Compile options from ini
     for k, v in config.default.items():
         value = getattr(options, k, _Default(None))
         if not isinstance(value, _Default):
@@ -50,6 +53,7 @@ def parse_options(
             value = bool(int(value))
         setattr(options, name, value)
 
+    # Postprocess options
     opts = dict(options.__dict__.items())
     for name, value in opts.items():
         if isinstance(value, _Default):
@@ -59,6 +63,7 @@ def parse_options(
 
             setattr(options, name, value.value)
 
+    # Parse file related options
     options.file_params = dict()
     for k, s in config.sections.items():
         if k != config.default_section:
diff --git a/pylibs/pylama/main.py b/pylibs/pylama/main.py
@@ -25,6 +25,7 @@ def shell(args=None, error=True):
 
     options = parse_options(args)
     setup_logger(options)
+    LOGGER.info(options)
 
     # Install VSC hook
     if options.hook:
diff --git a/pylibs/pymode/lint.py b/pylibs/pymode/lint.py
@@ -4,6 +4,7 @@
 import json
 import locale
 
+from os import path as op
 from pylama.main import parse_options
 from pylama.tasks import check_path
 
@@ -20,6 +21,7 @@
 def check_file():
     """ Check current buffer. """
     buf = interface.get_current_buffer()
+    rootpath = interface.eval_code('getcwd()')
 
     async = int(interface.get_option('lint_async'))
     linters = interface.get_option('lint_checker')
@@ -33,15 +35,15 @@ def check_file():
     if async:
         add_task(
             run_checkers, callback=parse_result, title='Code checking',
-            buf=buf, options=options,
+            buf=buf, options=options, rootpath=rootpath,
         )
 
     else:
-        result = run_checkers(buf=buf, options=options)
+        result = run_checkers(buf=buf, options=options, rootpath=rootpath)
         parse_result(result, buf=buf)
 
 
-def run_checkers(callback=None, buf=None, options=None):
+def run_checkers(callback=None, buf=None, options=None, rootpath=None):
     """ Run pylama code.
 
     :return list: errors
@@ -50,7 +52,10 @@ def run_checkers(callback=None, buf=None, options=None):
     pylint_options = '--rcfile={0} -r n'.format(
         interface.get_var('lint_config')).split()
 
-    return check_path(buf.name, options=options, pylint=pylint_options)
+    path = buf.name
+    if rootpath:
+        path = op.relpath(path, rootpath)
+    return check_path(path, options=options, pylint=pylint_options)
 
 
 def parse_result(result, buf=None, **kwargs):
