Merge branch 'develop' of https://github.com/klen/python-mode into develop

Author: dannywillems

pymode/libs/pylama/__init__.py

@@ -5,7 +5,7 @@
 :license: BSD, see LICENSE for more details.
 """
 
-__version__ = "7.0.4"
+__version__ = "7.0.5"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <[email protected]>"
 __license__ = "GNU LGPL"

pymode/libs/pylama/core.py

@@ -34,6 +34,10 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
             if mask.match(path):
                 fileconfig.update(options.file_params[mask])
 
+        if options.skip and any(p.match(path) for p in options.skip):
+            LOGGER.info('Skip checking for path: %s', path)
+            return []
+
     try:
         with CodeContext(code, path) as ctx:
             code = ctx.code

pymode/libs/pylama/main.py

@@ -41,10 +41,6 @@ def check_path(options, rootdir=None, candidates=None, code=None):
         if not op.exists(path):
             continue
 
-        if options.skip and any(p.match(path) for p in options.skip):
-            LOGGER.info('Skip path: %s', path)
-            continue
-
         paths.append(path)
 
     if options.async:

pymode/lint.py

@@ -20,7 +20,8 @@ def code_check():
     """
     with silence_stderr():
 
-        from pylama.main import parse_options, check_path
+        from pylama.core import run
+        from pylama.main import parse_options
 
         if not env.curbuf.name:
             return env.stop()
@@ -54,9 +55,7 @@ def code_check():
             from pylama.core import LOGGER, logging
             LOGGER.setLevel(logging.DEBUG)
 
-        options.paths = [path]
-        errors = check_path(
-            options=options, code='\n'.join(env.curbuf) + '\n', rootdir=env.curdir)
+        errors = run(path, code='\n'.join(env.curbuf) + '\n', options=options)
 
     env.debug("Find errors: ", len(errors))
     sort_rules = env.var('g:pymode_lint_sort')