More lints

setup.py

@@ -55,6 +55,6 @@ def readme():
     packages=find_packages(),
     namespace_packages=['sphinxcontrib'],
     include_package_data=True,
-    test_suite='sphinxcontrib.autoprogram.suite',
-    install_requires=requires
+    install_requires=requires,
+    test_suite='sphinxcontrib.autoprogram.suite'
 )

sphinxcontrib/autoprogram.py

@@ -11,29 +11,19 @@
 # pylint: disable=protected-access,missing-docstring
 import argparse
 import collections
-try:
-    import builtins
-except ImportError:
-    import __builtin__ as builtins
-import functools
 import os
 import re
 import sys
 import unittest
 
 from docutils import nodes
+from docutils.parsers.rst import Directive
 from docutils.parsers.rst.directives import unchanged
 from docutils.statemachine import StringList, ViewList
 from six import exec_
-from sphinx.util.nodes import nested_parse_with_titles
+from six.moves import builtins, reduce
 from sphinx.domains import std
-
-try:
-    # sphinx.util.compat.Directive class is now deprecated.
-    # Please use instead docutils.parsers.rst.Directive
-    from sphinx.util.compat import Directive
-except ImportError:
-    from docutils.parsers.rst import Directive
+from sphinx.util.nodes import nested_parse_with_titles
 
 __all__ = ('AutoprogramDirective',
            'AutoprogramDirectiveTestCase', 'ScannerTestCase',
@@ -141,8 +131,7 @@ def import_object(import_name):
         else:
             raise ImportError("No module named {}".format(module_name))
 
-    reduce_ = getattr(functools, 'reduce', None) or reduce
-    mod = reduce_(getattr, module_name.split('.')[1:], mod)
+    mod = reduce(getattr, module_name.split('.')[1:], mod)
     globals_ = builtins
     if not isinstance(globals_, dict):
         globals_ = globals_.__dict__

tox.ini

@@ -2,14 +2,11 @@
 envlist =
     {py27,py33,py34,py35,py36,pypy}-{sphinx17,sphinx16,sphinx15}
     py26-{sphinx16,sphinx15,sphinx14,sphinx13,sphinx12}
+    lint
 minversion = 2.7.0
 
-[pep8]
-exclude = .tox,doc
-
 [testenv]
 deps =
-    pep8
     sphinx17: Sphinx >= 1.7.0, < 1.8.0
     sphinx16: Sphinx >= 1.6.0, < 1.7.0
     sphinx15: Sphinx >= 1.5.0, < 1.6.0
@@ -18,4 +15,15 @@ deps =
     sphinx12: Sphinx >= 1.2.0, < 1.3.0
 commands =
     python setup.py test
-    pep8
+
+[testenv:lint]
+deps =
+    flake8 >= 3.5.0, < 4.0.0
+    flake8-import-order-spoqa >= 1.3.0, < 2.0.0
+commands =
+    flake8 sphinxcontrib/
+
+[flake8]
+exclude = .tox, doc
+import-order-style = spoqa
+application-import-names = sphinxcontrib.autoprogram