From cc70c2def167e76f3c51a36252d04cf2631e657f Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Fri, 1 Feb 2019 21:46:53 +0900
Subject: [PATCH 1/2] Fix flake8 violations

---
 sphinx/__init__.py       |  2 +-
 sphinx/util/inventory.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 66065ce35..52b8d40a3 100644
--- a/sphinx/__init__.py
+++ b/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.
diff --git a/sphinx/util/inventory.py b/sphinx/util/inventory.py
index 1f0530d82..5e3923abc 100644
--- a/sphinx/util/inventory.py
+++ b/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

From 4ad11820026602dda80ba62d94814d963d0ea463 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Fri, 1 Feb 2019 21:56:52 +0900
Subject: [PATCH 2/2] Call flake8 on py27

---
 .travis.yml | 2 +-
 tox.ini     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f156d59d7..89ba9eb96 100644
--- a/.travis.yml
+++ b/.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
diff --git a/tox.ini b/tox.ini
index f189a778c..697265d62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ commands=
     pytest --durations 25 {posargs}
 
 [testenv:flake8]
-basepython = python3
+basepython = python2
 description =
     Run style checks.
 commands =