Merge pull request #6545 from cjerdonek/vcs-imports

Remove from pip/_internal/__init__.py the vcs module imports

src/pip/_internal/__init__.py

@@ -42,7 +42,6 @@
 from pip._internal.commands import commands_dict
 from pip._internal.exceptions import PipError
 from pip._internal.utils import deprecation
-from pip._internal.vcs import git, mercurial, subversion, bazaar  # noqa
 from pip._vendor.urllib3.exceptions import InsecureRequestWarning
 
 logger = logging.getLogger(__name__)

src/pip/_internal/download.py

@@ -37,8 +37,8 @@
 from pip._internal.utils.misc import (
     ARCHIVE_EXTENSIONS, ask, ask_input, ask_password, ask_path_exists,
     backup_dir, consume, display_path, format_size, get_installed_version,
-    remove_auth_from_url, rmtree, split_auth_netloc_from_url, splitext,
-    unpack_file,
+    path_to_url, remove_auth_from_url, rmtree, split_auth_netloc_from_url,
+    splitext, unpack_file,
 )
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
@@ -52,7 +52,7 @@
     from optparse import Values
     from pip._internal.models.link import Link
     from pip._internal.utils.hashes import Hashes
-    from pip._internal.vcs import AuthInfo, VersionControl
+    from pip._internal.vcs.versioncontrol import AuthInfo, VersionControl
 
 try:
     import ssl  # noqa
@@ -693,17 +693,6 @@ def url_to_path(url):
     return path
 
 
-def path_to_url(path):
-    # type: (Union[str, Text]) -> str
-    """
-    Convert a path to a file: URL.  The path will be made absolute and have
-    quoted path parts.
-    """
-    path = os.path.normpath(os.path.abspath(path))
-    url = urllib_parse.urljoin('file:', urllib_request.pathname2url(path))
-    return url
-
-
 def is_archive_file(name):
     # type: (str) -> bool
     """Return True if `name` is a considered as an archive file."""

src/pip/_internal/index.py

@@ -82,8 +82,8 @@ def _match_vcs_scheme(url):
 
     Returns the matched VCS scheme, or None if there's no match.
     """
-    from pip._internal.vcs import VcsSupport
-    for scheme in VcsSupport.schemes:
+    from pip._internal.vcs import vcs
+    for scheme in vcs.schemes:
         if url.lower().startswith(scheme) and url[len(scheme)] in '+:':
             return scheme
     return None

src/pip/_internal/utils/misc.py

@@ -25,6 +25,7 @@
 from pip._vendor.six import PY2
 from pip._vendor.six.moves import input, shlex_quote
 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
 
 from pip._internal.exceptions import CommandError, InstallationError
@@ -941,6 +942,17 @@ def enum(*sequential, **named):
     return type('Enum', (), enums)
 
 
+def path_to_url(path):
+    # type: (Union[str, Text]) -> str
+    """
+    Convert a path to a file: URL.  The path will be made absolute and have
+    quoted path parts.
+    """
+    path = os.path.normpath(os.path.abspath(path))
+    url = urllib_parse.urljoin('file:', urllib_request.pathname2url(path))
+    return url
+
+
 def split_auth_from_netloc(netloc):
     """
     Parse out and remove the auth information from a netloc.