Update flake8 to 2.5.2

Author: Vladimir Rudnyh

contrib/flake8/__init__.py

@@ -1 +1 @@
-__version__ = '2.2.3'
+__version__ = '2.5.2'

contrib/flake8/_pyflakes.py

@@ -6,6 +6,9 @@
     pass
 else:
     demandimport.disable()
+import os
+
+import pep8
 import pyflakes
 import pyflakes.checker
 
@@ -39,23 +42,78 @@ class FlakesChecker(pyflakes.checker.Checker):
     version = pyflakes.__version__
 
     def __init__(self, tree, filename):
+        filename = pep8.normalize_paths(filename)[0]
+        withDoctest = self.withDoctest
+        included_by = [include for include in self.include_in_doctest
+                       if include != '' and filename.startswith(include)]
+        if included_by:
+            withDoctest = True
+
+        for exclude in self.exclude_from_doctest:
+            if exclude != '' and filename.startswith(exclude):
+                withDoctest = False
+                overlaped_by = [include for include in included_by
+                                if include.startswith(exclude)]
+
+                if overlaped_by:
+                    withDoctest = True
+
         super(FlakesChecker, self).__init__(tree, filename,
-                                            withDoctest=self.withDoctest)
+                                            withDoctest=withDoctest)
 
     @classmethod
     def add_options(cls, parser):
         parser.add_option('--builtins',
                           help="define more built-ins, comma separated")
         parser.add_option('--doctests', default=False, action='store_true',
                           help="check syntax of the doctests")
-        parser.config_options.extend(['builtins', 'doctests'])
+        parser.add_option('--include-in-doctest', default='',
+                          dest='include_in_doctest',
+                          help='Run doctests only on these files',
+                          type='string')
+        parser.add_option('--exclude-from-doctest', default='',
+                          dest='exclude_from_doctest',
+                          help='Skip these files when running doctests',
+                          type='string')
+        parser.config_options.extend(['builtins', 'doctests',
+                                      'include-in-doctest',
+                                      'exclude-from-doctest'])
 
     @classmethod
     def parse_options(cls, options):
         if options.builtins:
             cls.builtIns = cls.builtIns.union(options.builtins.split(','))
         cls.withDoctest = options.doctests
 
+        included_files = []
+        for included_file in options.include_in_doctest.split(','):
+            if included_file == '':
+                continue
+            if not included_file.startswith((os.sep, './', '~/')):
+                included_files.append('./' + included_file)
+            else:
+                included_files.append(included_file)
+        cls.include_in_doctest = pep8.normalize_paths(','.join(included_files))
+
+        excluded_files = []
+        for excluded_file in options.exclude_from_doctest.split(','):
+            if excluded_file == '':
+                continue
+            if not excluded_file.startswith((os.sep, './', '~/')):
+                excluded_files.append('./' + excluded_file)
+            else:
+                excluded_files.append(excluded_file)
+        cls.exclude_from_doctest = pep8.normalize_paths(
+            ','.join(excluded_files))
+
+        inc_exc = set(cls.include_in_doctest).intersection(
+            set(cls.exclude_from_doctest))
+        if inc_exc:
+            raise ValueError('"%s" was specified in both the '
+                             'include-in-doctest and exclude-from-doctest '
+                             'options. You are not allowed to specify it in '
+                             'both for doctesting.' % inc_exc)
+
     def run(self):
         for m in self.messages:
             col = getattr(m, 'col', 0)

contrib/flake8/callbacks.py

@@ -0,0 +1,27 @@
+import atexit
+import sys
+
+
+def install_vcs_hook(option, option_str, value, parser):
+    # For now, there's no way to affect a change in how pep8 processes
+    # options. If no args are provided and there's no config file present,
+    # it will error out because no input was provided. To get around this,
+    # when we're using --install-hook, we'll say that there were arguments so
+    # we can actually attempt to install the hook.
+    # See: https://gitlab.com/pycqa/flake8/issues/2 and
+    # https://github.com/jcrocholl/pep8/blob/4c5bf00cb613be617c7f48d3b2b82a1c7b895ac1/pep8.py#L1912
+    # for more context.
+    parser.values.install_hook = True
+    parser.rargs.append('.')
+
+
+def restore_stdout(old_stdout):
+    sys.stdout.close()
+    sys.stdout = old_stdout
+
+
+def redirect_stdout(option, option_str, value, parser):
+    fd = open(value, 'w')
+    old_stdout, sys.stdout = sys.stdout, fd
+
+    atexit.register(restore_stdout, old_stdout)

contrib/flake8/compat.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+"""Compatibility shims for Flake8."""
+import os.path
+import sys
+
+
+def relpath(path, start='.'):
+    """Wallpaper over the differences between 2.6 and newer versions."""
+    if sys.version_info < (2, 7) and path.startswith(start):
+        return path[len(start):]
+    else:
+        return os.path.relpath(path, start=start)