Merge pull request #5997 from tk0miya/fix_flake8

Fix flake8 violations

.travis.yml

@@ -37,7 +37,7 @@ matrix:
       env: TOXENV=docs
     - python: '3.6'
       env: TOXENV=mypy
-    - python: '3.6'
+    - python: '2.7'
       env: TOXENV=flake8
 
     - language: node_js

sphinx/__init__.py

@@ -25,7 +25,7 @@ from .deprecation import RemovedInSphinx20Warning
 if False:
     # For type annotation
     # note: Don't use typing.TYPE_CHECK here (for py27 and py34).
-    from typing import Any  # NOQA
+    from typing import Any, List  # NOQA
 
 
 # by default, all DeprecationWarning under sphinx package will be emit.

sphinx/util/inventory.py

@@ -143,11 +143,11 @@ class InventoryFile(object):
             if not m:
                 continue
             name, type, prio, location, dispname = m.groups()
-            if type == 'py:module' and type in invdata and \
-                    name in invdata[type]:  # due to a bug in 1.1 and below,
-                                            # two inventory entries are created
-                                            # for Python modules, and the first
-                                            # one is correct
+            if type == 'py:module' and type in invdata and name in invdata[type]:
+                # due to a bug in 1.1 and below,
+                # two inventory entries are created
+                # for Python modules, and the first
+                # one is correct
                 continue
             if location.endswith(u'$'):
                 location = location[:-1] + name

tox.ini

@@ -29,7 +29,7 @@ commands=
     pytest --durations 25 {posargs}
 
 [testenv:flake8]
-basepython = python3
+basepython = python2
 description =
     Run style checks.
 commands =