Merge pull request #97 from diraol/fix-96-pydocstyle_v2

Fix #96 pydocstyle 2.0.0

.travis.yml

@@ -4,7 +4,6 @@ python:
     - "2.7"
 
 env:
-    - TOXENV=py26
     - TOXENV=py27
     - TOXENV=py33
     - TOXENV=py35

README.rst

@@ -46,7 +46,7 @@ Docs are available at https://pylama.readthedocs.org/. Pull requests with docume
 Requirements:
 =============
 
-- Python (2.6, 2.7, 3.2, 3.3)
+- Python (2.7, 3.2, 3.3)
 - To use JavaScript checker (``gjslint``) you need to install ``python-gflags`` with ``pip install python-gflags``.
 - If your tests are failing on Win platform you are missing: ``curses`` - http://www.lfd.uci.edu/~gohlke/pythonlibs/
   (The curses library supplies a terminal-independent screen-painting and keyboard-handling facility for text-based terminals)

pylama/config.py

@@ -30,7 +30,7 @@
 LOGGER.addHandler(STREAM)
 
 
-class _Default(object):
+class _Default(object):  # pylint: disable=too-few-public-methods
 
     def __init__(self, value=None):
         self.value = value
@@ -42,14 +42,14 @@ def __repr__(self):
         return "<_Default [%s]>" % self.value
 
 
-def split_csp_str(s):
+def split_csp_str(val):
     """ Split comma separated string into unique values, keeping their order.
 
     :returns: list of splitted values
 
     """
     seen = set()
-    values = s if isinstance(s, (list, tuple)) else s.strip().split(',')
+    values = val if isinstance(val, (list, tuple)) else val.strip().split(',')
     return [x for x in values if x and not (x in seen or seen.add(x))]
 
 
@@ -65,7 +65,7 @@ def parse_linters(linters):
         if linter:
             result.append((name, linter))
         else:
-            logging.warn("Linter `%s` not found.", name)
+            logging.warning("Linter `%s` not found.", name)
     return result
 
 
@@ -131,7 +131,7 @@ def parse_linters(linters):
     help="Use absolute paths in output.")
 
 
-ACTIONS = dict((a.dest, a) for a in PARSER._actions)
+ACTIONS = dict((a.dest, a) for a in PARSER._actions)  # pylint: disable=protected-access
 
 
 def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
@@ -140,8 +140,7 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
     :return argparse.Namespace:
 
     """
-    if args is None:
-        args = []
+    args = args or []
 
     # Parse args from command string
     options = PARSER.parse_args(args)
@@ -162,10 +161,7 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
         # Parse file related options
         for name, opts in cfg.sections.items():
 
-            if not name.startswith('pylama'):
-                continue
-
-            if name == cfg.default_section:
+            if not name.startswith('pylama') or name == cfg.default_section:
                 continue
 
             name = name[7:]
@@ -178,12 +174,7 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
             options.file_params[mask] = dict(opts)
 
     # Override options
-    for opt, val in overrides.items():
-        passed_value = getattr(options, opt, _Default())
-        if opt in ('ignore', 'select') and passed_value:
-            setattr(options, opt, process_value(opt, passed_value.value) + process_value(opt, val))
-        elif isinstance(passed_value, _Default):
-            setattr(options, opt, process_value(opt, val))
+    _override_options(options, **overrides)
 
     # Postprocess options
     for name in options.__dict__:
@@ -192,12 +183,24 @@ def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
             setattr(options, name, process_value(name, value.value))
 
     if options.async and 'pylint' in options.linters:
-        LOGGER.warn('Cant parse code asynchronously while pylint is enabled.')
+        LOGGER.warning('Can\'t parse code asynchronously with pylint enabled.')
         options.async = False
 
     return options
 
 
+def _override_options(options, **overrides):
+    """Override options."""
+    for opt, val in overrides.items():
+        passed_value = getattr(options, opt, _Default())
+        if opt in ('ignore', 'select') and passed_value:
+            value = process_value(opt, passed_value.value)
+            value += process_value(opt, val)
+            setattr(options, opt, value)
+        elif isinstance(passed_value, _Default):
+            setattr(options, opt, process_value(opt, val))
+
+
 def process_value(name, value):
     """ Compile option value. """
     action = ACTIONS.get(name)
@@ -234,7 +237,7 @@ def get_config(ini_path=None, rootdir=CURDIR):
 
 
 def setup_logger(options):
-    """ Setup logger with options. """
+    """Do the logger setup with options."""
     LOGGER.setLevel(logging.INFO if options.verbose else logging.WARN)
     if options.report:
         LOGGER.removeHandler(STREAM)

pylama/lint/pylama_pydocstyle.py

@@ -1,6 +1,13 @@
 """pydocstyle support."""
 
-from pydocstyle import PEP257Checker
+THIRD_ARG = True
+try:
+    #: Import for pydocstyle 2.0.0 and newer
+    from pydocstyle import ConventionChecker as PyDocChecker
+except ImportError:
+    #: Backward compatibility for pydocstyle prior to 2.0.0
+    from pydocstyle import PEP257Checker as PyDocChecker
+    THIRD_ARG = False
 
 from pylama.lint import Linter as Abstract
 
@@ -15,11 +22,12 @@ def run(path, code=None, **meta):
 
         :return list: List of errors.
         """
+        check_source_args = (code, path, None) if THIRD_ARG else (code, path)
         return [{
             'lnum': e.line,
             # Remove colon after error code ("D403: ..." => "D403 ...").
             'text': (e.message[0:4] + e.message[5:]
                      if e.message[4] == ':' else e.message),
             'type': 'D',
             'number': e.code
-        } for e in PEP257Checker().check_source(code, path)]
+        } for e in PyDocChecker().check_source(*check_source_args)]

setup.py

@@ -20,9 +20,6 @@
 install_requires = [
     l.replace('==', '>=') for l in _read('requirements.txt').split('\n')
     if l and not l.startswith('#') and not l.startswith('-')]
-if sys.version_info < (2, 7):
-    install_requires += ['argparse']
-
 
 meta = dict(
     name=_project,

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py34,cov
+envlist = py27,py34,cov
 
 [pytest]
 addopts = -s
@@ -13,11 +13,6 @@ deps =
     pytest
     -rrequirements.txt
 
-[testenv:py26]
-deps =
-    argparse
-    {[testenv]deps}
-
 [testenv:cov]
 deps =
     coverage