Move path_to_url() to utils/urls.py (#7075)

Author: pradyunsg

src/pip/_internal/cache.py

@@ -13,9 +13,9 @@
 
 from pip._internal.models.link import Link
 from pip._internal.utils.compat import expanduser
-from pip._internal.utils.misc import path_to_url
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+from pip._internal.utils.urls import path_to_url
 from pip._internal.wheel import InvalidWheelFilename, Wheel
 
 if MYPY_CHECK_RUNNING:

src/pip/_internal/collector.py

@@ -17,9 +17,9 @@
 
 from pip._internal.models.link import Link
 from pip._internal.utils.filetypes import ARCHIVE_EXTENSIONS
-from pip._internal.utils.misc import path_to_url, redact_auth_from_url
+from pip._internal.utils.misc import redact_auth_from_url
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.utils.urls import url_to_path
+from pip._internal.utils.urls import path_to_url, url_to_path
 from pip._internal.vcs import is_url, vcs
 
 if MYPY_CHECK_RUNNING:

src/pip/_internal/download.py

@@ -43,7 +43,6 @@
     hide_url,
     parse_netloc,
     path_to_display,
-    path_to_url,
     rmtree,
     splitext,
 )
@@ -90,7 +89,6 @@
 
 
 __all__ = ['get_file_content',
-           'path_to_url',
            'unpack_vcs_link',
            'unpack_file_url',
            'unpack_http_url', 'unpack_url',

src/pip/_internal/models/link.py

@@ -6,14 +6,13 @@
 
 from pip._internal.utils.filetypes import WHEEL_EXTENSION
 from pip._internal.utils.misc import (
-    path_to_url,
     redact_auth_from_url,
     split_auth_from_netloc,
     splitext,
 )
 from pip._internal.utils.models import KeyBasedCompareMixin
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.utils.urls import url_to_path
+from pip._internal.utils.urls import path_to_url, url_to_path
 
 if MYPY_CHECK_RUNNING:
     from typing import Optional, Text, Tuple, Union

src/pip/_internal/req/constructors.py

@@ -26,8 +26,9 @@
 from pip._internal.pyproject import make_pyproject_path
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.filetypes import ARCHIVE_EXTENSIONS
-from pip._internal.utils.misc import is_installable_dir, path_to_url, splitext
+from pip._internal.utils.misc import is_installable_dir, splitext
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+from pip._internal.utils.urls import path_to_url
 from pip._internal.vcs import is_url, vcs
 from pip._internal.wheel import Wheel
 

src/pip/_internal/utils/misc.py

@@ -23,7 +23,6 @@
 from pip._vendor.six import PY2, text_type
 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 import __version__
@@ -882,17 +881,6 @@ 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 build_netloc(host, port):
     # type: (str, Optional[int]) -> str
     """

src/pip/_internal/utils/urls.py

@@ -1,3 +1,4 @@
+import os
 import sys
 
 from pip._vendor.six.moves.urllib import parse as urllib_parse
@@ -16,6 +17,17 @@ def get_url_scheme(url):
     return url.split(':', 1)[0].lower()
 
 
+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 url_to_path(url):
     # type: (str) -> str
     """

src/pip/_internal/vcs/bazaar.py

@@ -5,13 +5,9 @@
 
 from pip._vendor.six.moves.urllib import parse as urllib_parse
 
-from pip._internal.utils.misc import (
-    display_path,
-    make_command,
-    path_to_url,
-    rmtree,
-)
+from pip._internal.utils.misc import display_path, make_command, rmtree
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+from pip._internal.utils.urls import path_to_url
 from pip._internal.vcs.versioncontrol import VersionControl, vcs
 
 if MYPY_CHECK_RUNNING:

src/pip/_internal/vcs/mercurial.py

@@ -5,9 +5,10 @@
 
 from pip._vendor.six.moves import configparser
 
-from pip._internal.utils.misc import display_path, make_command, path_to_url
+from pip._internal.utils.misc import display_path, make_command
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+from pip._internal.utils.urls import path_to_url
 from pip._internal.vcs.versioncontrol import VersionControl, vcs
 
 if MYPY_CHECK_RUNNING:

src/pip/_internal/wheel.py

@@ -43,14 +43,14 @@
     captured_stdout,
     ensure_dir,
     format_command_args,
-    path_to_url,
     read_chunks,
 )
 from pip._internal.utils.setuptools_build import make_setuptools_shim_args
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 from pip._internal.utils.ui import open_spinner
 from pip._internal.utils.unpacking import unpack_file
+from pip._internal.utils.urls import path_to_url
 
 if MYPY_CHECK_RUNNING:
     from typing import (

tests/unit/test_download.py

@@ -24,7 +24,7 @@
 from pip._internal.exceptions import HashMismatch
 from pip._internal.models.link import Link
 from pip._internal.utils.hashes import Hashes
-from pip._internal.utils.misc import path_to_url
+from pip._internal.utils.urls import path_to_url
 from tests.lib import create_file
 from tests.lib.filesystem import (
     get_filelist,

tests/unit/test_req.py

@@ -31,7 +31,7 @@
 )
 from pip._internal.req.req_file import process_line
 from pip._internal.req.req_tracker import RequirementTracker
-from pip._internal.utils.misc import path_to_url
+from pip._internal.utils.urls import path_to_url
 from tests.lib import (
     DATA_DIR,
     assert_raises_regexp,

tests/unit/test_urls.py

@@ -1,9 +1,10 @@
+import os
 import sys
 
 import pytest
+from pip._vendor.six.moves.urllib import request as urllib_request
 
-from pip._internal.utils.misc import path_to_url
-from pip._internal.utils.urls import get_url_scheme, url_to_path
+from pip._internal.utils.urls import get_url_scheme, path_to_url, url_to_path
 
 
 @pytest.mark.parametrize("url,expected", [
@@ -16,6 +17,22 @@ def test_get_url_scheme(url, expected):
     assert get_url_scheme(url) == expected
 
 
+@pytest.mark.skipif("sys.platform == 'win32'")
+def test_path_to_url_unix():
+    assert path_to_url('/tmp/file') == 'file:///tmp/file'
+    path = os.path.join(os.getcwd(), 'file')
+    assert path_to_url('file') == 'file://' + urllib_request.pathname2url(path)
+
+
+@pytest.mark.skipif("sys.platform != 'win32'")
+def test_path_to_url_win():
+    assert path_to_url('c:/tmp/file') == 'file:///C:/tmp/file'
+    assert path_to_url('c:\\tmp\\file') == 'file:///C:/tmp/file'
+    assert path_to_url(r'\\unc\as\path') == 'file://unc/as/path'
+    path = os.path.join(os.getcwd(), 'file')
+    assert path_to_url('file') == 'file:' + urllib_request.pathname2url(path)
+
+
 @pytest.mark.parametrize("url,win_expected,non_win_expected", [
     ('file:tmp', 'tmp', 'tmp'),
     ('file:c:/path/to/file', r'C:\path\to\file', 'c:/path/to/file'),

tests/unit/test_utils.py

@@ -18,7 +18,6 @@
 
 import pytest
 from mock import Mock, patch
-from pip._vendor.six.moves.urllib import request as urllib_request
 
 from pip._internal.exceptions import (
     HashMismatch,
@@ -51,7 +50,6 @@
     normalize_version_info,
     parse_netloc,
     path_to_display,
-    path_to_url,
     redact_auth_from_url,
     redact_netloc,
     remove_auth_from_url,
@@ -1022,22 +1020,6 @@ def test_closes_stdin(self):
             )
 
 
-@pytest.mark.skipif("sys.platform == 'win32'")
-def test_path_to_url_unix():
-    assert path_to_url('/tmp/file') == 'file:///tmp/file'
-    path = os.path.join(os.getcwd(), 'file')
-    assert path_to_url('file') == 'file://' + urllib_request.pathname2url(path)
-
-
-@pytest.mark.skipif("sys.platform != 'win32'")
-def test_path_to_url_win():
-    assert path_to_url('c:/tmp/file') == 'file:///C:/tmp/file'
-    assert path_to_url('c:\\tmp\\file') == 'file:///C:/tmp/file'
-    assert path_to_url(r'\\unc\as\path') == 'file://unc/as/path'
-    path = os.path.join(os.getcwd(), 'file')
-    assert path_to_url('file') == 'file:' + urllib_request.pathname2url(path)
-
-
 @pytest.mark.parametrize('host_port, expected_netloc', [
     # Test domain name.
     (('example.com', None), 'example.com'),