Merge pull request #6282 from mkurnikov/update-flake8-to-3.7.6

Update flake8 to 3.7.6

setup.cfg

@@ -20,6 +20,7 @@ exclude =
     _vendor,
     data
 select = E,W,F
+ignore = W504
 
 [mypy]
 follow_imports = silent

src/pip/_internal/build_env.py

@@ -18,8 +18,8 @@
 from pip._internal.utils.ui import open_spinner
 
 if MYPY_CHECK_RUNNING:
-    from typing import Tuple, Set, Iterable, Optional, List  # noqa: F401
-    from pip._internal.index import PackageFinder  # noqa: F401
+    from typing import Tuple, Set, Iterable, Optional, List
+    from pip._internal.index import PackageFinder
 
 logger = logging.getLogger(__name__)
 

src/pip/_internal/cache.py

@@ -16,8 +16,8 @@
 from pip._internal.wheel import InvalidWheelFilename, Wheel
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, Set, List, Any  # noqa: F401
-    from pip._internal.index import FormatControl  # noqa: F401
+    from typing import Optional, Set, List, Any
+    from pip._internal.index import FormatControl
 
 logger = logging.getLogger(__name__)
 

src/pip/_internal/cli/base_command.py

@@ -37,10 +37,10 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, List, Tuple, Any  # noqa: F401
-    from optparse import Values  # noqa: F401
-    from pip._internal.cache import WheelCache  # noqa: F401
-    from pip._internal.req.req_set import RequirementSet  # noqa: F401
+    from typing import Optional, List, Tuple, Any
+    from optparse import Values
+    from pip._internal.cache import WheelCache
+    from pip._internal.req.req_set import RequirementSet
 
 __all__ = ['Command']
 

src/pip/_internal/cli/cmdoptions.py

@@ -24,9 +24,9 @@
 from pip._internal.utils.ui import BAR_TYPES
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, Callable, Dict, List, Optional, Union  # noqa: F401
-    from optparse import OptionParser, Values  # noqa: F401
-    from pip._internal.cli.parser import ConfigOptionParser  # noqa: F401
+    from typing import Any, Callable, Dict, Optional
+    from optparse import OptionParser, Values
+    from pip._internal.cli.parser import ConfigOptionParser
 
 
 def raise_option_error(parser, option, msg):

src/pip/_internal/cli/main_parser.py

@@ -17,7 +17,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Tuple, List  # noqa: F401
+    from typing import Tuple, List
 
 
 __all__ = ["create_main_parser", "parse_command"]

src/pip/_internal/commands/__init__.py

@@ -20,8 +20,8 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import List, Type  # noqa: F401
-    from pip._internal.cli.base_command import Command  # noqa: F401
+    from typing import List, Type
+    from pip._internal.cli.base_command import Command
 
 commands_order = [
     InstallCommand,

src/pip/_internal/configuration.py

@@ -29,7 +29,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
+    from typing import (
         Any, Dict, Iterable, List, NewType, Optional, Tuple
     )
 

src/pip/_internal/download.py

@@ -48,12 +48,12 @@
 from pip._internal.vcs import vcs
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
+    from typing import (
         Optional, Tuple, Dict, IO, Text, Union
     )
-    from pip._internal.models.link import Link  # noqa: F401
-    from pip._internal.utils.hashes import Hashes  # noqa: F401
-    from pip._internal.vcs import AuthInfo  # noqa: F401
+    from pip._internal.models.link import Link
+    from pip._internal.utils.hashes import Hashes
+    from pip._internal.vcs import AuthInfo
 
 try:
     import ssl  # noqa

src/pip/_internal/exceptions.py

@@ -8,8 +8,8 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional  # noqa: F401
-    from pip._internal.req.req_install import InstallRequirement  # noqa: F401
+    from typing import Optional
+    from pip._internal.req.req_install import InstallRequirement
 
 
 class PipError(Exception):

src/pip/_internal/index.py

@@ -41,15 +41,15 @@
 from pip._internal.wheel import Wheel
 
 if MYPY_CHECK_RUNNING:
-    from logging import Logger  # noqa: F401
-    from typing import (  # noqa: F401
+    from logging import Logger
+    from typing import (
         Tuple, Optional, Any, List, Union, Callable, Set, Sequence,
         Iterable, MutableMapping
     )
-    from pip._vendor.packaging.version import _BaseVersion  # noqa: F401
-    from pip._vendor.requests import Response  # noqa: F401
-    from pip._internal.req import InstallRequirement  # noqa: F401
-    from pip._internal.download import PipSession  # noqa: F401
+    from pip._vendor.packaging.version import _BaseVersion
+    from pip._vendor.requests import Response
+    from pip._internal.req import InstallRequirement
+    from pip._internal.download import PipSession
 
     SecureOrigin = Tuple[str, str, Optional[str]]
     BuildTag = Tuple[Any, ...]  # either emply tuple or Tuple[int, str]
@@ -227,7 +227,7 @@ def _get_html_page(link, session=None):
 
     try:
         resp = _get_html_response(url, session=session)
-    except _NotHTTP as exc:
+    except _NotHTTP:
         logger.debug(
             'Skipping page %s because it looks like an archive, and cannot '
             'be checked by HEAD.', link,

src/pip/_internal/locations.py

@@ -15,7 +15,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, Union, Dict, List, Optional  # noqa: F401
+    from typing import Any, Union, Dict, List, Optional
 
 
 # Application Directories

src/pip/_internal/models/candidate.py

@@ -4,9 +4,9 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from pip._vendor.packaging.version import _BaseVersion  # noqa: F401
-    from pip._internal.models.link import Link  # noqa: F401
-    from typing import Any, Union  # noqa: F401
+    from pip._vendor.packaging.version import _BaseVersion
+    from pip._internal.models.link import Link
+    from typing import Any
 
 
 class InstallationCandidate(KeyBasedCompareMixin):

src/pip/_internal/models/format_control.py

@@ -3,7 +3,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, Set, FrozenSet  # noqa: F401
+    from typing import Optional, Set, FrozenSet
 
 
 class FormatControl(object):

src/pip/_internal/models/link.py

@@ -11,8 +11,8 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, Tuple, Union, Text  # noqa: F401
-    from pip._internal.index import HTMLPage  # noqa: F401
+    from typing import Optional, Tuple, Union
+    from pip._internal.index import HTMLPage
 
 
 class Link(KeyBasedCompareMixin):

src/pip/_internal/operations/check.py

@@ -14,8 +14,8 @@
 logger = logging.getLogger(__name__)
 
 if MYPY_CHECK_RUNNING:
-    from pip._internal.req.req_install import InstallRequirement  # noqa: F401
-    from typing import (  # noqa: F401
+    from pip._internal.req.req_install import InstallRequirement
+    from typing import (
         Any, Callable, Dict, Optional, Set, Tuple, List
     )
 

src/pip/_internal/operations/freeze.py

@@ -20,11 +20,11 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
+    from typing import (
         Iterator, Optional, List, Container, Set, Dict, Tuple, Iterable, Union
     )
-    from pip._internal.cache import WheelCache  # noqa: F401
-    from pip._vendor.pkg_resources import (  # noqa: F401
+    from pip._internal.cache import WheelCache
+    from pip._vendor.pkg_resources import (
         Distribution, Requirement
     )
 

src/pip/_internal/operations/prepare.py

@@ -22,11 +22,11 @@
 from pip._internal.vcs import vcs
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, Optional  # noqa: F401
-    from pip._internal.req.req_install import InstallRequirement  # noqa: F401
-    from pip._internal.index import PackageFinder  # noqa: F401
-    from pip._internal.download import PipSession  # noqa: F401
-    from pip._internal.req.req_tracker import RequirementTracker  # noqa: F401
+    from typing import Any, Optional
+    from pip._internal.req.req_install import InstallRequirement
+    from pip._internal.index import PackageFinder
+    from pip._internal.download import PipSession
+    from pip._internal.req.req_tracker import RequirementTracker
 
 logger = logging.getLogger(__name__)
 

src/pip/_internal/pep425tags.py

@@ -15,7 +15,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
+    from typing import (
         Tuple, Callable, List, Optional, Union, Dict
     )
 

src/pip/_internal/pyproject.py

@@ -10,7 +10,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, Tuple, Optional, List  # noqa: F401
+    from typing import Any, Tuple, Optional, List
 
 
 def _is_list_of_str(obj):

src/pip/_internal/req/__init__.py

@@ -9,7 +9,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import List, Sequence  # noqa: F401
+    from typing import List, Sequence
 
 __all__ = [
     "RequirementSet", "InstallRequirement",

src/pip/_internal/req/constructors.py

@@ -31,10 +31,10 @@
 from pip._internal.wheel import Wheel
 
 if MYPY_CHECK_RUNNING:
-    from typing import (   # noqa: F401
-        Optional, Tuple, Set, Any, Union, Text, Dict,
+    from typing import (
+        Optional, Tuple, Set, Any, Union, Dict,
     )
-    from pip._internal.cache import WheelCache  # noqa: F401
+    from pip._internal.cache import WheelCache
 
 
 __all__ = [

src/pip/_internal/req/req_file.py

@@ -22,13 +22,13 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
+    from typing import (
         Iterator, Tuple, Optional, List, Callable, Text
     )
-    from pip._internal.req import InstallRequirement  # noqa: F401
-    from pip._internal.cache import WheelCache  # noqa: F401
-    from pip._internal.index import PackageFinder  # noqa: F401
-    from pip._internal.download import PipSession  # noqa: F401
+    from pip._internal.req import InstallRequirement
+    from pip._internal.cache import WheelCache
+    from pip._internal.index import PackageFinder
+    from pip._internal.download import PipSession
 
     ReqFileLines = Iterator[Tuple[int, Text]]
 

src/pip/_internal/req/req_install.py

@@ -41,15 +41,15 @@
 from pip._internal.wheel import move_wheel_files
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
-        Optional, Iterable, List, Union, Any, Text, Sequence, Dict
+    from typing import (
+        Optional, Iterable, List, Union, Any, Sequence, Dict
     )
-    from pip._internal.build_env import BuildEnvironment  # noqa: F401
-    from pip._internal.cache import WheelCache  # noqa: F401
-    from pip._internal.index import PackageFinder  # noqa: F401
-    from pip._vendor.pkg_resources import Distribution  # noqa: F401
-    from pip._vendor.packaging.specifiers import SpecifierSet  # noqa: F401
-    from pip._vendor.packaging.markers import Marker  # noqa: F401
+    from pip._internal.build_env import BuildEnvironment
+    from pip._internal.cache import WheelCache
+    from pip._internal.index import PackageFinder
+    from pip._vendor.pkg_resources import Distribution
+    from pip._vendor.packaging.specifiers import SpecifierSet
+    from pip._vendor.packaging.markers import Marker
 
 
 logger = logging.getLogger(__name__)

src/pip/_internal/req/req_set.py

@@ -9,8 +9,8 @@
 from pip._internal.wheel import Wheel
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, List, Tuple, Dict, Iterable  # noqa: F401
-    from pip._internal.req.req_install import InstallRequirement  # noqa: F401
+    from typing import Optional, List, Tuple, Dict, Iterable
+    from pip._internal.req.req_install import InstallRequirement
 
 
 logger = logging.getLogger(__name__)

src/pip/_internal/req/req_tracker.py

@@ -10,9 +10,9 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Set, Iterator  # noqa: F401
-    from pip._internal.req.req_install import InstallRequirement  # noqa: F401
-    from pip._internal.models.link import Link  # noqa: F401
+    from typing import Set, Iterator
+    from pip._internal.req.req_install import InstallRequirement
+    from pip._internal.models.link import Link
 
 logger = logging.getLogger(__name__)
 

src/pip/_internal/resolve.py

@@ -25,15 +25,15 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Optional, DefaultDict, List, Set  # noqa: F401
-    from pip._internal.download import PipSession  # noqa: F401
-    from pip._internal.req.req_install import InstallRequirement  # noqa: F401
-    from pip._internal.index import PackageFinder  # noqa: F401
-    from pip._internal.req.req_set import RequirementSet  # noqa: F401
-    from pip._internal.operations.prepare import (  # noqa: F401
+    from typing import Optional, DefaultDict, List, Set
+    from pip._internal.download import PipSession
+    from pip._internal.req.req_install import InstallRequirement
+    from pip._internal.index import PackageFinder
+    from pip._internal.req.req_set import RequirementSet
+    from pip._internal.operations.prepare import (
         DistAbstraction, RequirementPreparer
     )
-    from pip._internal.cache import WheelCache  # noqa: F401
+    from pip._internal.cache import WheelCache
 
 logger = logging.getLogger(__name__)
 

src/pip/_internal/utils/appdirs.py

@@ -13,9 +13,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import (  # noqa: F401
-        List, Union
-    )
+    from typing import List
 
 
 def user_cache_dir(appname):

src/pip/_internal/utils/compat.py

@@ -14,7 +14,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Tuple, Text  # noqa: F401
+    from typing import Tuple, Text
 
 try:
     import ipaddress

src/pip/_internal/utils/deprecation.py

@@ -12,7 +12,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, Optional  # noqa: F401
+    from typing import Any, Optional
 
 
 class PipDeprecationWarning(Warning):

src/pip/_internal/utils/encoding.py

@@ -6,7 +6,7 @@
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import List, Tuple, Text  # noqa: F401
+    from typing import List, Tuple, Text
 
 BOMS = [
     (codecs.BOM_UTF8, 'utf8'),