Update pymode.

klen · klen · commit d2dead6ce9d9 · 2017-07-04T16:27:09.000+03:00
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -135,7 +135,7 @@ call pymode#default("g:pymode_lint_info_symbol", "II")
 call pymode#default("g:pymode_lint_pyflakes_symbol", "FF")
 
 " Code checkers options
-call pymode#default("g:pymode_lint_options_pep8",
+call pymode#default("g:pymode_lint_options_pycodestyle",
     \ {'max_line_length': g:pymode_options_max_line_length})
 
 call pymode#default("g:pymode_lint_options_pylint",
diff --git a/pymode/environment.py b/pymode/environment.py
@@ -59,7 +59,7 @@ def lines(self):
         return [l.decode(self.options.get('encoding')) for l in self.curbuf]
 
     @staticmethod
-    def var(name, to_bool=False, silence=False):
+    def var(name, to_bool=False, silence=False, default=None):
         """Get vim variable.
 
         :return vimobj:
@@ -69,7 +69,7 @@ def var(name, to_bool=False, silence=False):
             value = vim.eval(name)
         except vim.error:
             if silence:
-                return None
+                return default
             raise
 
         if to_bool:
diff --git a/pymode/lint.py b/pymode/lint.py
@@ -15,7 +15,7 @@
     pass
 
 
-def code_check():
+def code_check():  # noqa
     """Run pylama and check current file.
 
     :return bool:
@@ -25,26 +25,29 @@ def code_check():
 
         from pylama.core import run
         from pylama.main import parse_options
+        from pylama.config import _override_options
 
         if not env.curbuf.name:
             return env.stop()
 
-        linters = env.var('g:pymode_lint_checkers')
-        env.debug(linters)
-
         options = parse_options(
-            linters=linters, force=1,
+            force=1,
             ignore=env.var('g:pymode_lint_ignore'),
             select=env.var('g:pymode_lint_select'),
         )
 
-        for linter in linters:
-            opts = env.var('g:pymode_lint_options_%s' % linter, silence=True)
-            if opts:
-                options.linters_params[linter] = options.linters_params.get(linter, {})
-                options.linters_params[linter].update(opts)
-        options.linters_params['pylint']['clear_cache'] = True
+        linters = env.var('g:pymode_lint_checkers', default=[])
+        if linters:
+            _override_options(options, linters=",".join(linters))
+
+            for linter in dict(options.linters):
+                opts = env.var('g:pymode_lint_options_%s' % linter, silence=True)
+                if opts:
+                    options.linters_params[linter] = options.linters_params.get(linter, {})
+                    options.linters_params[linter].update(opts)
 
+        if 'pylint' in options.linters_params:
+            options.linters_params['pylint']['clear_cache'] = True
         env.debug(options)
 
         path = os.path.relpath(env.curbuf.name, env.curdir)
