From f77b8ca051a9d05147e0fa2d08d08bafe27dea8a Mon Sep 17 00:00:00 2001 From: Maxim Kurnikov Date: Fri, 22 Feb 2019 14:17:07 +0300 Subject: [PATCH] remove #noqa: F401 --- src/pip/_internal/build_env.py | 4 ++-- src/pip/_internal/cache.py | 4 ++-- src/pip/_internal/cli/base_command.py | 8 ++++---- src/pip/_internal/cli/cmdoptions.py | 6 +++--- src/pip/_internal/cli/main_parser.py | 2 +- src/pip/_internal/commands/__init__.py | 4 ++-- src/pip/_internal/configuration.py | 2 +- src/pip/_internal/download.py | 8 ++++---- src/pip/_internal/exceptions.py | 4 ++-- src/pip/_internal/index.py | 12 ++++++------ src/pip/_internal/locations.py | 2 +- src/pip/_internal/models/candidate.py | 6 +++--- src/pip/_internal/models/format_control.py | 2 +- src/pip/_internal/models/link.py | 4 ++-- src/pip/_internal/operations/check.py | 4 ++-- src/pip/_internal/operations/freeze.py | 6 +++--- src/pip/_internal/operations/prepare.py | 10 +++++----- src/pip/_internal/pep425tags.py | 2 +- src/pip/_internal/pyproject.py | 2 +- src/pip/_internal/req/__init__.py | 2 +- src/pip/_internal/req/constructors.py | 4 ++-- src/pip/_internal/req/req_file.py | 10 +++++----- src/pip/_internal/req/req_install.py | 14 +++++++------- src/pip/_internal/req/req_set.py | 4 ++-- src/pip/_internal/req/req_tracker.py | 6 +++--- src/pip/_internal/resolve.py | 14 +++++++------- src/pip/_internal/utils/appdirs.py | 4 +--- src/pip/_internal/utils/compat.py | 2 +- src/pip/_internal/utils/deprecation.py | 2 +- src/pip/_internal/utils/encoding.py | 2 +- src/pip/_internal/utils/glibc.py | 2 +- src/pip/_internal/utils/hashes.py | 6 +++--- src/pip/_internal/utils/misc.py | 8 ++++---- src/pip/_internal/utils/outdated.py | 6 +++--- src/pip/_internal/utils/packaging.py | 6 +++--- src/pip/_internal/utils/typing.py | 2 +- src/pip/_internal/utils/ui.py | 2 +- src/pip/_internal/vcs/__init__.py | 4 ++-- src/pip/_internal/wheel.py | 16 ++++++++-------- 39 files changed, 103 insertions(+), 105 deletions(-) diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py index 85a2c4a91..89830e72b 100644 --- a/src/pip/_internal/build_env.py +++ b/src/pip/_internal/build_env.py @@ -18,8 +18,8 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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__) diff --git a/src/pip/_internal/cache.py b/src/pip/_internal/cache.py index eb295c4e7..9379343c2 100644 --- a/src/pip/_internal/cache.py +++ b/src/pip/_internal/cache.py @@ -16,8 +16,8 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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__) diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py index 3ceea4992..659686f35 100644 --- a/src/pip/_internal/cli/base_command.py +++ b/src/pip/_internal/cli/base_command.py @@ -37,10 +37,10 @@ from pip._internal.utils.outdated import pip_version_check 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'] diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 5cf5ee970..0074f89d9 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -24,9 +24,9 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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, List, Optional, Union + from optparse import OptionParser, Values + from pip._internal.cli.parser import ConfigOptionParser def raise_option_error(parser, option, msg): diff --git a/src/pip/_internal/cli/main_parser.py b/src/pip/_internal/cli/main_parser.py index b17c74928..767f35d50 100644 --- a/src/pip/_internal/cli/main_parser.py +++ b/src/pip/_internal/cli/main_parser.py @@ -17,7 +17,7 @@ from pip._internal.utils.misc import get_prog 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"] diff --git a/src/pip/_internal/commands/__init__.py b/src/pip/_internal/commands/__init__.py index c7d1da3d9..2e90db34f 100644 --- a/src/pip/_internal/commands/__init__.py +++ b/src/pip/_internal/commands/__init__.py @@ -20,8 +20,8 @@ from pip._internal.commands.wheel import WheelCommand 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, diff --git a/src/pip/_internal/configuration.py b/src/pip/_internal/configuration.py index fe6df9b75..6458d6db5 100644 --- a/src/pip/_internal/configuration.py +++ b/src/pip/_internal/configuration.py @@ -29,7 +29,7 @@ from pip._internal.utils.misc import ensure_dir, enum 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 ) diff --git a/src/pip/_internal/download.py b/src/pip/_internal/download.py index cc2fa7098..3f5bb0d5e 100644 --- a/src/pip/_internal/download.py +++ b/src/pip/_internal/download.py @@ -48,12 +48,12 @@ from pip._internal.utils.ui import DownloadProgressProvider 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 diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py index 38ceeea92..7b291a1e4 100644 --- a/src/pip/_internal/exceptions.py +++ b/src/pip/_internal/exceptions.py @@ -8,8 +8,8 @@ from pip._vendor.six import iteritems 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): diff --git a/src/pip/_internal/index.py b/src/pip/_internal/index.py index 9eda3a351..479549d94 100644 --- a/src/pip/_internal/index.py +++ b/src/pip/_internal/index.py @@ -41,15 +41,15 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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] diff --git a/src/pip/_internal/locations.py b/src/pip/_internal/locations.py index c6e2a3e48..8fd84c3d8 100644 --- a/src/pip/_internal/locations.py +++ b/src/pip/_internal/locations.py @@ -15,7 +15,7 @@ from pip._internal.utils.compat import WINDOWS, expanduser 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 diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py index 4475458ab..b66c3657f 100644 --- a/src/pip/_internal/models/candidate.py +++ b/src/pip/_internal/models/candidate.py @@ -4,9 +4,9 @@ from pip._internal.utils.models import KeyBasedCompareMixin 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): diff --git a/src/pip/_internal/models/format_control.py b/src/pip/_internal/models/format_control.py index 971a3914c..53138e48e 100644 --- a/src/pip/_internal/models/format_control.py +++ b/src/pip/_internal/models/format_control.py @@ -3,7 +3,7 @@ from pip._vendor.packaging.utils import canonicalize_name 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): diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py index ad2f93e19..753e309a0 100644 --- a/src/pip/_internal/models/link.py +++ b/src/pip/_internal/models/link.py @@ -11,8 +11,8 @@ from pip._internal.utils.models import KeyBasedCompareMixin 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, Text + from pip._internal.index import HTMLPage class Link(KeyBasedCompareMixin): diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py index 0b56eda45..920df5d48 100644 --- a/src/pip/_internal/operations/check.py +++ b/src/pip/_internal/operations/check.py @@ -14,8 +14,8 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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 ) diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py index 388bb73ab..0c4c76107 100644 --- a/src/pip/_internal/operations/freeze.py +++ b/src/pip/_internal/operations/freeze.py @@ -20,11 +20,11 @@ from pip._internal.utils.misc import ( 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 ) diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index 4f31dd5a6..d1e9896fb 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -22,11 +22,11 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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__) diff --git a/src/pip/_internal/pep425tags.py b/src/pip/_internal/pep425tags.py index 1e782d1ae..3b68f28d2 100644 --- a/src/pip/_internal/pep425tags.py +++ b/src/pip/_internal/pep425tags.py @@ -15,7 +15,7 @@ from pip._internal.utils.compat import get_extension_suffixes 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 ) diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py index 8d739a6c1..43efbed42 100644 --- a/src/pip/_internal/pyproject.py +++ b/src/pip/_internal/pyproject.py @@ -10,7 +10,7 @@ from pip._internal.exceptions import InstallationError 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): diff --git a/src/pip/_internal/req/__init__.py b/src/pip/_internal/req/__init__.py index 5e4eb92f0..177b2b19d 100644 --- a/src/pip/_internal/req/__init__.py +++ b/src/pip/_internal/req/__init__.py @@ -9,7 +9,7 @@ from pip._internal.utils.logging import indent_log 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", diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index 1eed1dd38..8b3aafc62 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -31,10 +31,10 @@ from pip._internal.vcs import vcs from pip._internal.wheel import Wheel if MYPY_CHECK_RUNNING: - from typing import ( # noqa: F401 + from typing import ( Optional, Tuple, Set, Any, Union, Text, Dict, ) - from pip._internal.cache import WheelCache # noqa: F401 + from pip._internal.cache import WheelCache __all__ = [ diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py index 726f2f6a0..3260e8d75 100644 --- a/src/pip/_internal/req/req_file.py +++ b/src/pip/_internal/req/req_file.py @@ -22,13 +22,13 @@ from pip._internal.req.constructors import ( 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]] diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index 0c54e5e48..df39f286c 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -41,15 +41,15 @@ from pip._internal.vcs import vcs from pip._internal.wheel import move_wheel_files if MYPY_CHECK_RUNNING: - from typing import ( # noqa: F401 + from typing import ( Optional, Iterable, List, Union, Any, Text, 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__) diff --git a/src/pip/_internal/req/req_set.py b/src/pip/_internal/req/req_set.py index d1410e935..4951d2621 100644 --- a/src/pip/_internal/req/req_set.py +++ b/src/pip/_internal/req/req_set.py @@ -9,8 +9,8 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING 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__) diff --git a/src/pip/_internal/req/req_tracker.py b/src/pip/_internal/req/req_tracker.py index 82e084a4c..4f5f4f337 100644 --- a/src/pip/_internal/req/req_tracker.py +++ b/src/pip/_internal/req/req_tracker.py @@ -10,9 +10,9 @@ from pip._internal.utils.temp_dir import TempDirectory 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__) diff --git a/src/pip/_internal/resolve.py b/src/pip/_internal/resolve.py index 33f572f1e..f49667bb8 100644 --- a/src/pip/_internal/resolve.py +++ b/src/pip/_internal/resolve.py @@ -25,15 +25,15 @@ from pip._internal.utils.packaging import check_dist_requires_python 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__) diff --git a/src/pip/_internal/utils/appdirs.py b/src/pip/_internal/utils/appdirs.py index 9af9fa7b5..b83d3a96c 100644 --- a/src/pip/_internal/utils/appdirs.py +++ b/src/pip/_internal/utils/appdirs.py @@ -13,9 +13,7 @@ from pip._internal.utils.compat import WINDOWS, expanduser from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - from typing import ( # noqa: F401 - List, Union - ) + from typing import List, Union def user_cache_dir(appname): diff --git a/src/pip/_internal/utils/compat.py b/src/pip/_internal/utils/compat.py index 2d8b3bf06..845436e48 100644 --- a/src/pip/_internal/utils/compat.py +++ b/src/pip/_internal/utils/compat.py @@ -14,7 +14,7 @@ from pip._vendor.six import text_type 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 diff --git a/src/pip/_internal/utils/deprecation.py b/src/pip/_internal/utils/deprecation.py index 0beaf74ba..cd754a15e 100644 --- a/src/pip/_internal/utils/deprecation.py +++ b/src/pip/_internal/utils/deprecation.py @@ -12,7 +12,7 @@ from pip import __version__ as current_version 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): diff --git a/src/pip/_internal/utils/encoding.py b/src/pip/_internal/utils/encoding.py index d36defadb..9861530c9 100644 --- a/src/pip/_internal/utils/encoding.py +++ b/src/pip/_internal/utils/encoding.py @@ -6,7 +6,7 @@ import sys 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'), diff --git a/src/pip/_internal/utils/glibc.py b/src/pip/_internal/utils/glibc.py index 8a51f6954..5bea655eb 100644 --- a/src/pip/_internal/utils/glibc.py +++ b/src/pip/_internal/utils/glibc.py @@ -7,7 +7,7 @@ import warnings from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - from typing import Optional, Tuple # noqa: F401 + from typing import Optional, Tuple def glibc_version_string(): diff --git a/src/pip/_internal/utils/hashes.py b/src/pip/_internal/utils/hashes.py index c6df7a187..a7142069f 100644 --- a/src/pip/_internal/utils/hashes.py +++ b/src/pip/_internal/utils/hashes.py @@ -11,14 +11,14 @@ from pip._internal.utils.misc import read_chunks from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - from typing import ( # noqa: F401 + from typing import ( Dict, List, BinaryIO, NoReturn, Iterator ) from pip._vendor.six import PY3 if PY3: - from hashlib import _Hash # noqa: F401 + from hashlib import _Hash else: - from hashlib import _hash as _Hash # noqa: F401 + from hashlib import _hash as _Hash # The recommended hash algo of the moment. Change this whenever the state of diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index 79e4bad77..8a5808caf 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -43,13 +43,13 @@ else: from io import StringIO if MYPY_CHECK_RUNNING: - from typing import ( # noqa: F401 + from typing import ( Optional, Tuple, Iterable, List, Match, Union, Any, Mapping, Text, AnyStr, Container ) - from pip._vendor.pkg_resources import Distribution # noqa: F401 - from pip._internal.models.link import Link # noqa: F401 - from pip._internal.utils.ui import SpinnerInterface # noqa: F401 + from pip._vendor.pkg_resources import Distribution + from pip._internal.models.link import Link + from pip._internal.utils.ui import SpinnerInterface __all__ = ['rmtree', 'display_path', 'backup_dir', diff --git a/src/pip/_internal/utils/outdated.py b/src/pip/_internal/utils/outdated.py index 37c47a4a5..f76927611 100644 --- a/src/pip/_internal/utils/outdated.py +++ b/src/pip/_internal/utils/outdated.py @@ -16,9 +16,9 @@ from pip._internal.utils.misc import ensure_dir, get_installed_version from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - import optparse # noqa: F401 - from typing import Any, Dict # noqa: F401 - from pip._internal.download import PipSession # noqa: F401 + import optparse + from typing import Any, Dict + from pip._internal.download import PipSession SELFCHECK_DATE_FMT = "%Y-%m-%dT%H:%M:%SZ" diff --git a/src/pip/_internal/utils/packaging.py b/src/pip/_internal/utils/packaging.py index 7aaf7b5e8..449f3fd6b 100644 --- a/src/pip/_internal/utils/packaging.py +++ b/src/pip/_internal/utils/packaging.py @@ -12,9 +12,9 @@ from pip._internal.utils.misc import display_path from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - from typing import Optional # noqa: F401 - from email.message import Message # noqa: F401 - from pip._vendor.pkg_resources import Distribution # noqa: F401 + from typing import Optional + from email.message import Message + from pip._vendor.pkg_resources import Distribution logger = logging.getLogger(__name__) diff --git a/src/pip/_internal/utils/typing.py b/src/pip/_internal/utils/typing.py index e085cdfeb..10170ce29 100644 --- a/src/pip/_internal/utils/typing.py +++ b/src/pip/_internal/utils/typing.py @@ -21,7 +21,7 @@ In pip, all static-typing related imports should be guarded as follows: from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - from typing import ... # noqa: F401 + from typing import ... Ref: https://github.com/python/mypy/issues/3216 """ diff --git a/src/pip/_internal/utils/ui.py b/src/pip/_internal/utils/ui.py index 433675d73..822371f19 100644 --- a/src/pip/_internal/utils/ui.py +++ b/src/pip/_internal/utils/ui.py @@ -21,7 +21,7 @@ from pip._internal.utils.misc import format_size from pip._internal.utils.typing import MYPY_CHECK_RUNNING if MYPY_CHECK_RUNNING: - from typing import Any, Iterator, IO # noqa: F401 + from typing import Any, Iterator, IO try: from pip._vendor import colorama diff --git a/src/pip/_internal/vcs/__init__.py b/src/pip/_internal/vcs/__init__.py index 9cba76464..41eed89d5 100644 --- a/src/pip/_internal/vcs/__init__.py +++ b/src/pip/_internal/vcs/__init__.py @@ -16,10 +16,10 @@ from pip._internal.utils.misc import ( 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, Mapping, Optional, Text, Tuple, Type ) - from pip._internal.utils.ui import SpinnerInterface # noqa: F401 + from pip._internal.utils.ui import SpinnerInterface AuthInfo = Tuple[Optional[str], Optional[str]] diff --git a/src/pip/_internal/wheel.py b/src/pip/_internal/wheel.py index a123ac888..2e5bcf174 100644 --- a/src/pip/_internal/wheel.py +++ b/src/pip/_internal/wheel.py @@ -41,19 +41,19 @@ from pip._internal.utils.typing import MYPY_CHECK_RUNNING from pip._internal.utils.ui import open_spinner if MYPY_CHECK_RUNNING: - from typing import ( # noqa: F401 + from typing import ( Dict, List, Optional, Sequence, Mapping, Tuple, IO, Text, Any, Union, Iterable ) - from pip._vendor.packaging.requirements import Requirement # noqa: F401 - from pip._internal.req.req_install import InstallRequirement # noqa: F401 - from pip._internal.download import PipSession # noqa: F401 - from pip._internal.index import FormatControl, PackageFinder # noqa: F401 - from pip._internal.operations.prepare import ( # noqa: F401 + from pip._vendor.packaging.requirements import Requirement + from pip._internal.req.req_install import InstallRequirement + from pip._internal.download import PipSession + from pip._internal.index import FormatControl, PackageFinder + from pip._internal.operations.prepare import ( RequirementPreparer ) - from pip._internal.cache import WheelCache # noqa: F401 - from pip._internal.pep425tags import Pep425Tag # noqa: F401 + from pip._internal.cache import WheelCache + from pip._internal.pep425tags import Pep425Tag InstalledCSVRow = Tuple[str, ...]