Merge pull request #217 from Nurdok/drop_py26_support

Drop support for Python 2.6.

Author: Nurdok

.travis.yml

@@ -9,8 +9,6 @@ install: pip install tox
 script: tox
 matrix:
   include:
-    - python: 2.6
-      env: TOXENV=py26
     - python: 2.7
       env: TOXENV=py27
     - python: 3.3

README.rst

@@ -10,7 +10,7 @@ docstring conventions.
 `PEP 257 <http://www.python.org/dev/peps/pep-0257/>`_ out of the box, but it
 should not be considered a reference implementation.
 
-**pydocstyle** supports Python 2.6, 2.7, 3.3, 3.4, 3.5, pypy and pypy3.
+**pydocstyle** supports Python 2.7, 3.3, 3.4, 3.5, pypy and pypy3.
 
 Quick Start
 -----------

docs/index.rst

@@ -1,15 +1,15 @@
 pydocstyle's documentation
 ==========================
 
-(formerly pep257)
-
 **pydocstyle** is a static analysis tool for checking compliance with Python
 docstring conventions.
 
 **pydocstyle** supports most of
 `PEP 257 <http://www.python.org/dev/peps/pep-0257/>`_ out of the box, but it
 should not be considered a reference implementation.
 
+**pydocstyle** supports Python 2.7, 3.3, 3.4, 3.5, pypy and pypy3.
+
 
 .. include:: quickstart.rst
 

docs/release_notes.rst

@@ -4,6 +4,13 @@ Release Notes
 **pydocstyle** version numbers follow the
 `Semantic Versioning <http://semver.org/>`_ specification.
 
+Current Development Version
+---------------------------
+
+Major Updates
+
+* Support for Python 2.6 has been dropped (#206, #217).
+
 1.1.1 - October 4th, 2016
 -------------------------
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.2rc
+current_version = 2.0.0rc
 commit = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>.*))?
 serialize = 

src/pydocstyle/config.py

@@ -260,7 +260,7 @@ def _read_configuration_file(self, path):
                     continue
 
                 if opt.replace('_', '-') not in self.CONFIG_FILE_OPTIONS:
-                    log.warning("Unknown option '{0}' ignored".format(opt))
+                    log.warning("Unknown option '{}' ignored".format(opt))
                     continue
 
                 normalized_opt = opt.replace('-', '_')
@@ -279,7 +279,7 @@ def _read_configuration_file(self, path):
 
         if options is not None:
             if not self._validate_options(options):
-                raise IllegalConfiguration('in file: {0}'.format(path))
+                raise IllegalConfiguration('in file: {}'.format(path))
 
         return options, should_inherit
 
@@ -413,12 +413,12 @@ def _validate_options(cls, options):
         for opt1, opt2 in \
                 itertools.permutations(cls.BASE_ERROR_SELECTION_OPTIONS, 2):
             if getattr(options, opt1) and getattr(options, opt2):
-                log.error('Cannot pass both {0} and {1}. They are '
+                log.error('Cannot pass both {} and {}. They are '
                           'mutually exclusive.'.format(opt1, opt2))
                 return False
 
         if options.convention and options.convention not in conventions:
-            log.error("Illegal convention '{0}'. Possible conventions: {1}"
+            log.error("Illegal convention '{}'. Possible conventions: {}"
                       .format(options.convention,
                               ', '.join(conventions.keys())))
             return False
@@ -442,7 +442,7 @@ def _get_set(value_str):
             Removes any occurrences of '' in the set.
 
             """
-            return set(value_str.split(',')) - set([''])
+            return set(value_str.split(',')) - {''}
 
         for opt in optional_set_options:
             value = getattr(options, opt)
@@ -497,7 +497,7 @@ def _create_option_parser(cls):
                     'for example: --ignore=D101,D202')
         option('--convention', metavar='<name>', default=None,
                help='choose the basic list of checked errors by specifying an '
-                    'existing convention. Possible conventions: {0}'
+                    'existing convention. Possible conventions: {}'
                     .format(', '.join(conventions)))
         option('--add-select', metavar='<codes>', default=None,
                help='amend the list of errors to check for by specifying '
@@ -509,12 +509,12 @@ def _create_option_parser(cls):
         # Match clauses
         option('--match', metavar='<pattern>', default=None,
                help=("check only files that exactly match <pattern> regular "
-                     "expression; default is --match='{0}' which matches "
+                     "expression; default is --match='{}' which matches "
                      "files that don't start with 'test_' but end with "
                      "'.py'").format(cls.DEFAULT_MATCH_RE))
         option('--match-dir', metavar='<pattern>', default=None,
                help=("search only dirs that exactly match <pattern> regular "
-                     "expression; default is --match-dir='{0}', which "
+                     "expression; default is --match-dir='{}', which "
                      "matches all dirs that don't start with "
                      "a dot").format(cls.DEFAULT_MATCH_DIR_RE))
 

src/pydocstyle/parser.py

@@ -42,7 +42,7 @@ class Value(object):
 
     def __init__(self, *args):
         if len(self._fields) != len(args):
-            raise ValueError('got {0} arguments for {1} fields for {2}: {3}'
+            raise ValueError('got {} arguments for {} fields for {}: {}'
                              .format(len(args), len(self._fields),
                                      self.__class__.__name__, self._fields))
         vars(self).update(zip(self._fields, args))
@@ -54,9 +54,9 @@ def __eq__(self, other):
         return other and vars(self) == vars(other)
 
     def __repr__(self):
-        kwargs = ', '.join('{0}={1!r}'.format(field, getattr(self, field))
+        kwargs = ', '.join('{}={!r}'.format(field, getattr(self, field))
                            for field in self._fields)
-        return '{0}({1})'.format(self.__class__.__name__, kwargs)
+        return '{}({})'.format(self.__class__.__name__, kwargs)
 
 
 class Definition(Value):
@@ -91,10 +91,9 @@ def is_empty_or_comment(line):
         return ''.join(reversed(list(filtered_src)))
 
     def __str__(self):
-        out = 'in {0} {1} `{2}`'.format(self._publicity, self._human,
-                                        self.name)
+        out = 'in {} {} `{}`'.format(self._publicity, self._human, self.name)
         if self.skipped_error_codes:
-            out += ' (skipping {0})'.format(self.skipped_error_codes)
+            out += ' (skipping {})'.format(self.skipped_error_codes)
         return out
 
 
@@ -154,7 +153,7 @@ def is_public(self):
         # Check if we are a setter/deleter method, and mark as private if so.
         for decorator in self.decorators:
             # Given 'foo', match 'foo.bar' but not 'foobar' or 'sfoo'
-            if re(r"^{0}\.".format(self.name)).match(decorator.name):
+            if re(r"^{}\.".format(self.name)).match(decorator.name):
                 return False
         name_is_public = (not self.name.startswith('_') or
                           self.name in VARIADIC_MAGIC_METHODS or
@@ -229,7 +228,7 @@ def __iter__(self):
 
 class TokenKind(int):
     def __repr__(self):
-        return "tk.{0}".format(tk.tok_name[self])
+        return "tk.{}".format(tk.tok_name[self])
 
 
 class Token(Value):
@@ -374,7 +373,7 @@ def parse_all(self):
             raise AllError('Could not evaluate contents of __all__. ')
         if self.current.value == '[':
             sys.stderr.write(
-                "{0} WARNING: __all__ is defined as a list, this means "
+                "{} WARNING: __all__ is defined as a list, this means "
                 "pydocstyle cannot reliably detect contents of the __all__ "
                 "variable, because it can be mutated. Change __all__ to be "
                 "an (immutable) tuple, to remove this warning. Note, "
@@ -395,7 +394,7 @@ def parse_all(self):
                     self.current.value == ','):
                 all_content += self.current.value
             else:
-                raise AllError('Unexpected token kind in  __all__: {0!r}. '
+                raise AllError('Unexpected token kind in  __all__: {!r}. '
                                .format(self.current.kind))
             self.stream.move()
         self.consume(tk.OP)
@@ -404,7 +403,7 @@ def parse_all(self):
             self.all = eval(all_content, {})
         except BaseException as e:
             raise AllError('Could not evaluate contents of __all__.'
-                           '\bThe value was {0}. The exception was:\n{1}'
+                           '\bThe value was {}. The exception was:\n{}'
                            .format(all_content, e))
 
     def parse_module(self):

src/pydocstyle/utils.py

@@ -2,7 +2,7 @@
 import logging
 
 
-__version__ = '1.1.2rc'
+__version__ = '2.0.0rc'
 log = logging.getLogger(__name__)
 
 

src/pydocstyle/violations.py

@@ -40,7 +40,7 @@ def set_context(self, definition, explanation):
     @property
     def message(self):
         """Return the message to print to the user."""
-        ret = '{0}: {1}'.format(self.code, self.short_desc)
+        ret = '{}: {}'.format(self.code, self.short_desc)
         if self.context is not None:
             ret += ' (' + self.context.format(*self.parameters) + ')'
         return ret
@@ -59,7 +59,7 @@ def lines(self):
         numbers_width = len(str(numbers_width))
         numbers_width = 6
         for n, line in enumerate(lines_stripped):
-            source += '{{0}}{0}: {{1}}'.format(numbers_width).format(
+            source += '{{}}{}: {{}}'.format(numbers_width).format(
                 n + offset, line)
             source += '%*d: %s' % (numbers_width, n + offset, line)
             if n > 5:
@@ -143,7 +143,7 @@ def to_rst(cls):
         for group in cls.groups:
             table += sep_line
             table += blank_line
-            table += '|' + '**{0}**'.format(group.name).center(78) + '|\n'
+            table += '|' + '**{}**'.format(group.name).center(78) + '|\n'
             table += blank_line
             for error in group.errors:
                 table += sep_line
@@ -212,10 +212,8 @@ class AttrDict(dict):
     def __getattr__(self, item):
         return self[item]
 
+all_errors = set(ErrorRegistry.get_error_codes())
 
 conventions = AttrDict({
-    'pep257': set(ErrorRegistry.get_error_codes()) - set(['D203',
-                                                          'D212',
-                                                          'D213',
-                                                          'D404'])
+    'pep257': all_errors - {'D203', 'D212', 'D213', 'D404'}
 })

src/tests/test_cases/expected.py

@@ -2,7 +2,7 @@ class Expectation(object):
     """Hold expectation for pep257 violations in tests."""
 
     def __init__(self):
-        self.expected = set([])
+        self.expected = set()
 
     def expect(self, *args):
         """Decorator that expects a certain PEP 257 violation."""