Fix mypy errors since addition of stubs

pip/commands/search.py

@@ -7,7 +7,9 @@
 
 from pip._vendor import pkg_resources
 from pip._vendor.packaging.version import parse as parse_version
-from pip._vendor.six.moves import xmlrpc_client
+# NOTE: XMLRPC Client is not annotated in typeshed as on 2017-07-17, which is
+#       why we ignore the type on this import
+from pip._vendor.six.moves import xmlrpc_client  # type: ignore
 
 from pip.basecommand import SUCCESS, Command
 from pip.download import PipXmlrpcTransport

pip/configuration.py

@@ -28,7 +28,7 @@
 if MYPY_CHECK_RUNNING:
     from typing import Any, Dict, Iterable, List, NewType, Optional, Tuple
 
-    ConfigParser = configparser.ConfigParser  # Shorthand
+    RawConfigParser = configparser.RawConfigParser  # Shorthand
     Kind = NewType("Kind", str)
 
 logger = logging.getLogger(__name__)
@@ -98,11 +98,11 @@ def __init__(self, isolated, load_only=None):
         # Because we keep track of where we got the data from
         self._parsers = {
             variant: [] for variant in self._override_order
-        }  # type: Dict[Kind, List[Tuple[str, ConfigParser]]]
+        }  # type: Dict[Kind, List[Tuple[str, RawConfigParser]]]
         self._config = {
             variant: {} for variant in self._override_order
         }  # type: Dict[Kind, Dict[str, Any]]
-        self._modified_parsers = []  # type: List[Tuple[str, ConfigParser]]
+        self._modified_parsers = []  # type: List[Tuple[str, RawConfigParser]]
 
     def load(self):
         # type: () -> None
@@ -259,7 +259,7 @@ def _load_config_files(self):
                 self._parsers[variant].append((fname, parser))
 
     def _load_file(self, variant, fname):
-        # type: (Kind, str) -> ConfigParser
+        # type: (Kind, str) -> RawConfigParser
         logger.debug("For variant '%s', will try loading '%s'", variant, fname)
         parser = self._construct_parser(fname)
 
@@ -270,7 +270,7 @@ def _load_file(self, variant, fname):
         return parser
 
     def _construct_parser(self, fname):
-        # type: (str) -> ConfigParser
+        # type: (str) -> RawConfigParser
         parser = configparser.RawConfigParser()
         # If there is no such file, don't bother reading it but create the
         # parser anyway, to hold the data.
@@ -345,7 +345,7 @@ def _iter_config_files(self):
             yield kinds.VENV, [venv_config_file]
 
     def _get_parser_to_modify(self):
-        # type: () -> Tuple[str, ConfigParser]
+        # type: () -> Tuple[str, RawConfigParser]
         # Determine which parser to modify
         parsers = self._parsers[self.load_only]
         if not parsers:
@@ -359,7 +359,7 @@ def _get_parser_to_modify(self):
 
     # XXX: This is patched in the tests.
     def _mark_as_modified(self, fname, parser):
-        # type: (str, ConfigParser) -> None
+        # type: (str, RawConfigParser) -> None
         file_parser_tuple = (fname, parser)
         if file_parser_tuple not in self._modified_parsers:
             self._modified_parsers.append(file_parser_tuple)

pip/download.py

@@ -22,7 +22,9 @@
 from pip._vendor.requests.packages import urllib3
 from pip._vendor.requests.structures import CaseInsensitiveDict
 from pip._vendor.requests.utils import get_netrc_auth
-from pip._vendor.six.moves import xmlrpc_client
+# NOTE: XMLRPC Client is not annotated in typeshed as on 2017-07-17, which is
+#       why we ignore the type on this import
+from pip._vendor.six.moves import xmlrpc_client  # type: ignore
 from pip._vendor.six.moves.urllib import parse as urllib_parse
 from pip._vendor.six.moves.urllib import request as urllib_request
 from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote

pip/utils/__init__.py

@@ -27,7 +27,9 @@
 from pip._vendor import pkg_resources
 from pip._vendor.six.moves import input
 from pip._vendor.six import PY2
-from pip._vendor.retrying import retry
+# NOTE: retrying is not annotated in typeshed as on 2017-07-17, which is
+#       why we ignore the type on this import
+from pip._vendor.retrying import retry  # type: ignore
 
 if PY2:
     from io import BytesIO as StringIO