linux2coder
diff --git a/‎pymode/libs/pylama/__init__.py
Lines changed: 2 additions & 4 deletions b/‎pymode/libs/pylama/__init__.py
Lines changed: 2 additions & 4 deletions
diff --git a/‎pymode/libs/pylama/config.py
Lines changed: 27 additions & 28 deletions b/‎pymode/libs/pylama/config.py
Lines changed: 27 additions & 28 deletions
diff --git a/‎pymode/libs/pylama/core.py
Lines changed: 3 additions & 4 deletions b/‎pymode/libs/pylama/core.py
Lines changed: 3 additions & 4 deletions
diff --git a/‎pymode/libs/pylama/lint/pylama_pep8/__init__.py
Lines changed: 7 additions & 7 deletions b/‎pymode/libs/pylama/lint/pylama_pep8/__init__.py
Lines changed: 7 additions & 7 deletions
@@ -5,9 +5,7 @@
 
 """
 
-version_info = 3, 0, 2
-
-__version__ = version = '.'.join(map(str, version_info))
-__project__ = __name__
+__version__ = "3.1.1"
+__project__ = "pylama"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"
@@ -7,7 +7,7 @@
 import logging
 from argparse import ArgumentParser
 
-from . import version
+from . import __version__
 from .libs.inirama import Namespace
 from .lint.extensions import LINTERS
 
@@ -72,7 +72,7 @@ def parse_linters(linters):
     "--verbose", "-v", action='store_true', help="Verbose mode.")
 
 PARSER.add_argument('--version', action='version',
-                    version='%(prog)s ' + version)
+                    version='%(prog)s ' + __version__)
 
 PARSER.add_argument(
     "--format", "-f", default=_Default('pep8'), choices=['pep8', 'pylint'],
@@ -116,7 +116,7 @@ def parse_linters(linters):
 ACTIONS = dict((a.dest, a) for a in PARSER._actions)
 
 
-def parse_options(args=None, **overrides): # noqa
+def parse_options(args=None, config=True, **overrides): # noqa
     """ Parse options from command line and configuration files.
 
     :return argparse.Namespace:
@@ -127,44 +127,43 @@ def parse_options(args=None, **overrides): # noqa
 
     # Parse args from command string
     options = PARSER.parse_args(args)
-
-    # Parse options from ini file
-    cfg = get_config(str(options.options))
-
-    # Compile options from ini
-    for k, v in cfg.default.items():
-        LOGGER.info('Find option %s (%s)', k, v)
-        passed_value = getattr(options, k, _Default())
-        if isinstance(passed_value, _Default):
-            setattr(options, k, _Default(v))
+    options.file_params = dict()
+    options.linter_params = dict()
 
     # Override options
     for k, v in overrides.items():
         passed_value = getattr(options, k, _Default())
         if isinstance(passed_value, _Default):
             setattr(options, k, _Default(v))
 
+    # Compile options from ini
+    if config:
+        cfg = get_config(str(options.options))
+        for k, v in cfg.default.items():
+            LOGGER.info('Find option %s (%s)', k, v)
+            passed_value = getattr(options, k, _Default())
+            if isinstance(passed_value, _Default):
+                setattr(options, k, _Default(v))
+
+        # Parse file related options
+        for k, s in cfg.sections.items():
+            if k == cfg.default_section:
+                continue
+            if k in LINTERS:
+                options.linter_params[k] = dict(s)
+                continue
+            mask = re(fnmatch.translate(k))
+            options.file_params[mask] = dict(s)
+            options.file_params[mask]['lint'] = int(
+                options.file_params[mask].get('lint', 1)
+            )
+
     # Postprocess options
     opts = dict(options.__dict__.items())
     for name, value in opts.items():
         if isinstance(value, _Default):
             setattr(options, name, process_value(name, value.value))
 
-    # Parse file related options
-    options.file_params = dict()
-    options.linter_params = dict()
-    for k, s in cfg.sections.items():
-        if k == cfg.default_section:
-            continue
-        if k in LINTERS:
-            options.linter_params[k] = dict(s)
-            continue
-        mask = re(fnmatch.translate(k))
-        options.file_params[mask] = dict(s)
-        options.file_params[mask]['lint'] = int(
-            options.file_params[mask].get('lint', 1)
-        )
-
     return options
 
 
 
@@ -47,11 +47,11 @@ def run(path, code=None, options=None):
                     item = (item, LINTERS.get(item))
 
                 name, linter = item
-                LOGGER.debug("Run %s", name)
 
                 if not linter or not linter.allow(path):
                     continue
 
+                LOGGER.info("Run %s", name)
                 meta = options.linter_params.get(name, dict())
                 result = linter.run(path, code=code, **meta)
                 for e in result:
@@ -77,9 +77,8 @@ def run(path, code=None, options=None):
         ))
 
     except Exception as e:
-        LOGGER.debug("Unknown exception %s", e)
         import traceback
-        logging.debug(traceback.format_exc())
+        LOGGER.info(traceback.format_exc())
 
     errors = [er for er in errors if filter_errors(er, **params)]
 
@@ -180,7 +179,7 @@ def __enter__(self):
 
     def __exit__(self, t, value, traceback):
         """ Close opened file. """
-        if not self._file is None:
+        if self._file is not None:
             self._file.close()
 
         if t and LOGGER.level == logging.DEBUG:
 
@@ -8,7 +8,6 @@
     from io import StringIO
 
 
-
 class Linter(BaseLinter):
 
     """ PEP8 code check. """
@@ -42,12 +41,13 @@ def error(self, line_number, offset, text, check):
         code = super(_PEP8Report, self).error(
             line_number, offset, text, check)
 
-        self.errors.append(dict(
-            text=text,
-            type=code.replace('E', 'C'),
-            col=offset + 1,
-            lnum=line_number,
-        ))
+        if code:
+            self.errors.append(dict(
+                text=text,
+                type=code.replace('E', 'C'),
+                col=offset + 1,
+                lnum=line_number,
+            ))
 
     def get_file_results(self):
         """ Get errors.