Lint respects pylama.ini and pymode.ini files.

klen · klen · commit 77d60d53b942 · 2013-06-06T16:52:59.000+08:00
diff --git a/pylibs/pylama/inirama.py b/pylibs/pylama/inirama.py
@@ -258,6 +258,9 @@ def __getitem__(self, name):
             self.sections[name] = self.section_type(self)
         return self.sections[name]
 
+    def __contains__(self, name):
+        return name in self.sections
+
     def __repr__(self):
         return "<Namespace: {0}>".format(self.sections)
 
diff --git a/pylibs/pymode/interface.py b/pylibs/pymode/interface.py
@@ -12,7 +12,8 @@ def get_var(name):
 
 
 def get_bvar(name):
-    return (int(vim.eval("exists('b:pymode_%s')" % name)) and vim.eval("b:pymode_%s" % name)) or None
+    return (int(vim.eval("exists('b:pymode_%s')" % name))
+            and vim.eval("b:pymode_%s" % name)) or None
 
 
 def get_current_buffer():
@@ -24,4 +25,10 @@ def show_message(message):
 
 
 def command(cmd):
-    vim.command(cmd)
+    return vim.command(cmd)
+
+
+def eval_code(code):
+    return vim.eval(code)
+
+# lint_ignore=F0401
diff --git a/pylibs/pymode/lint.py b/pylibs/pymode/lint.py
@@ -3,9 +3,11 @@
 import locale
 import json
 
-from pylama.main import run
+from pylama.main import run, prepare_params
+from pylama.inirama import Namespace
+from os import path as op
 
-from .interface import get_option, get_var, get_current_buffer, command
+from . import interface
 from .queue import add_task
 
 
@@ -16,48 +18,62 @@
 
 
 def check_file():
-    checkers = get_option('lint_checker').split(',')
+    checkers = interface.get_option('lint_checker').split(',')
+    buf = interface.get_current_buffer()
+
+    # Check configuration from `pymode.ini`
+    curdir = interface.eval_code('getcwd()')
+    config = Namespace()
+    config.default_section = 'main'
+    config.read(op.join(curdir, 'pylama.ini'), op.join(curdir, 'pymode.ini'))
 
     ignore = set([
         i for i in (
-            get_option('lint_ignore').split(',') +
-            get_var('lint_ignore').split(','))
-        if i
+            interface.get_option('lint_ignore').split(',') +
+            interface.get_var('lint_ignore').split(',') +
+            config.default.get('ignore', '').split(',')
+        ) if i
     ])
+
     select = set([
         s for s in (
-            get_option('lint_select').split(',') +
-            get_var('lint_select').split(','))
-        if s
+            interface.get_option('lint_select').split(',') +
+            interface.get_var('lint_select').split(',') +
+            config.default.get('select', '').split(',')
+        ) if s
     ])
 
-    buf = get_current_buffer()
-    complexity = int(get_option('lint_mccabe_complexity') or 0)
+    complexity = int(interface.get_option('lint_mccabe_complexity') or 0)
+
+    params = None
+    relpath = op.relpath(buf.name, curdir)
+    if relpath in config:
+        params = prepare_params(config[relpath])
 
     add_task(
         run_checkers,
         callback=parse_result,
         title='Code checking',
 
-        checkers=checkers,
-        ignore=ignore,
-        buf=buf,
-        select=select,
-        complexity=complexity)
+        # params
+        checkers=checkers, ignore=ignore, buf=buf, select=select,
+        complexity=complexity, config=params,
+    )
 
 
 def run_checkers(checkers=None, ignore=None, buf=None, select=None,
-                 complexity=None, callback=None):
+                 complexity=None, callback=None, config=None):
 
-    filename = buf.name
-    pylint_options = '--rcfile={0} -r n'.format(get_var('lint_config')).split()
+    pylint_options = '--rcfile={0} -r n'.format(
+        interface.get_var('lint_config')).split()
 
-    return run(filename, ignore=ignore, select=select, linters=checkers,
-               pylint=pylint_options, complexity=complexity)
+    return run(
+        buf.name, ignore=ignore, select=select, linters=checkers,
+        pylint=pylint_options, complexity=complexity, config=config)
 
 
 def parse_result(result, buf=None, **kwargs):
-    command('let g:qf_list = ' + json.dumps(result))
-    command('call pymode#lint#Parse({0})'.format(buf.number))
+    interface.command('let g:qf_list = ' + json.dumps(result))
+    interface.command('call pymode#lint#Parse({0})'.format(buf.number))
 
 # pymode:lint_ignore=W0622
