Merge branch '3_7' into 'master'

Remove noqa comments now that 3.7 has been released

See merge request pycqa/flake8!301

7 files changed, 9 insertions, 10 deletions

diff --git a/src/flake8/checker.py b/src/flake8/checker.py
index 5379362..138bb4f 100644
--- a/src/flake8/checker.py
+++ b/src/flake8/checker.py
@@ -5,7 +5,7 @@ import logging
 import signal
 import sys
 import tokenize
-from typing import List, Optional  # noqa: F401 (until flake8 3.7)
+from typing import List, Optional
 
 try:
     import multiprocessing
diff --git a/src/flake8/main/application.py b/src/flake8/main/application.py
index 202a269..4515d13 100644
--- a/src/flake8/main/application.py
+++ b/src/flake8/main/application.py
@@ -4,7 +4,7 @@ from __future__ import print_function
 import logging
 import sys
 import time
-from typing import List, Optional, Sequence  # noqa: F401 (until flake8 3.7)
+from typing import List, Optional, Sequence
 
 import flake8
 from flake8 import checker
diff --git a/src/flake8/main/cli.py b/src/flake8/main/cli.py
index d6cb933..53f31e9 100644
--- a/src/flake8/main/cli.py
+++ b/src/flake8/main/cli.py
@@ -1,5 +1,5 @@
 """Command-line implementation of flake8."""
-from typing import List, Optional  # noqa: F401 (until flake8 3.7)
+from typing import List, Optional
 
 from flake8.main import application
 
diff --git a/src/flake8/main/setuptools_command.py b/src/flake8/main/setuptools_command.py
index a3ccf03..1b57c0d 100644
--- a/src/flake8/main/setuptools_command.py
+++ b/src/flake8/main/setuptools_command.py
@@ -1,6 +1,6 @@
 """The logic for Flake8's integration with setuptools."""
 import os
-from typing import List  # noqa: F401 (until flake8 3.7)
+from typing import List
 
 import setuptools
 
diff --git a/src/flake8/processor.py b/src/flake8/processor.py
index ece20b6..61a9362 100644
--- a/src/flake8/processor.py
+++ b/src/flake8/processor.py
@@ -3,7 +3,7 @@ import contextlib
 import logging
 import sys
 import tokenize
-from typing import List  # noqa: F401 (until flake8 3.7)
+from typing import List
 
 import flake8
 from flake8 import defaults
diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py
index cf723df..c617f5a 100644
--- a/src/flake8/style_guide.py
+++ b/src/flake8/style_guide.py
@@ -7,7 +7,7 @@ import itertools
 import linecache
 import logging
 import sys
-from typing import Optional, Union  # noqa: F401 (until flake8 3.7)
+from typing import Optional, Union
 
 from flake8 import defaults
 from flake8 import statistics
diff --git a/src/flake8/utils.py b/src/flake8/utils.py
index 70b45e0..cb195ad 100644
--- a/src/flake8/utils.py
+++ b/src/flake8/utils.py
@@ -8,14 +8,13 @@ import platform
 import re
 import sys
 import tokenize
-from typing import Callable, Dict, Generator  # noqa: F401 (until flake8 3.7)
-from typing import List, Pattern, Sequence  # noqa: F401 (until flake8 3,7)
-from typing import Tuple, Union  # noqa: F401 (until flake8 3.7)
+from typing import Callable, Dict, Generator, List, Pattern, Sequence, Tuple
+from typing import Union
 
 from flake8 import exceptions
 
 if False:  # `typing.TYPE_CHECKING` was introduced in 3.5.2
-    from flake8.plugins.manager import Plugin  # noqa: F401 (until flake8 3.7)
+    from flake8.plugins.manager import Plugin
 
 DIFF_HUNK_REGEXP = re.compile(r"^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$")
 COMMA_SEPARATED_LIST_RE = re.compile(r"[,\s]")