Merge branch 'main' into 3.14

Author: ichard26

news/13509.bugfix.rst

@@ -0,0 +1 @@
+Fix normalization of local links with non-``file`` schemes.

news/13510.bugfix.rst

@@ -0,0 +1 @@
+Fix normalization of local link on Windows in newer Python versions.

src/pip/_internal/models/link.py

@@ -6,7 +6,6 @@
 import os
 import posixpath
 import re
-import sys
 import urllib.parse
 from collections.abc import Mapping
 from dataclasses import dataclass
@@ -133,8 +132,8 @@ def _clean_file_url_path(part: str) -> str:
     # exist, the colon should be quoted. We rely on urllib.request
     # to do the right thing here.
     ret = urllib.request.pathname2url(urllib.request.url2pathname(part))
-    if sys.version_info >= (3, 14):
-        # https://discuss.python.org/t/pathname2url-changes-in-python-3-14-breaking-pip-tests/97091
+    if ret.startswith("///"):
+        # Remove any URL authority section, leaving only the URL path.
         ret = ret.removeprefix("//")
     return ret
 
@@ -177,7 +176,11 @@ def _ensure_quoted_url(url: str) -> str:
     # If the netloc is empty, then the URL refers to a local filesystem path.
     is_local_path = not result.netloc
     path = _clean_url_path(result.path, is_local_path=is_local_path)
-    return urllib.parse.urlunsplit(result._replace(path=path))
+    # Temporarily replace scheme with file to ensure the URL generated by
+    # urlunsplit() contains an empty netloc (file://) as per RFC 1738.
+    ret = urllib.parse.urlunsplit(result._replace(scheme="file", path=path))
+    ret = result.scheme + ret[4:]  # Restore original scheme.
+    return ret
 
 
 def _absolute_link_url(base_url: str, url: str) -> str:

tests/lib/__init__.py

@@ -16,7 +16,6 @@
 from io import BytesIO, StringIO
 from textwrap import dedent
 from typing import Any, AnyStr, Callable, Literal, Protocol, Union, cast
-from urllib.parse import urlparse, urlunparse
 from urllib.request import pathname2url
 from zipfile import ZipFile
 
@@ -1370,25 +1369,9 @@ def __call__(
 # Accommodations for Windows path and URL changes in recent Python releases
 # -------------------------------------------------------------------------
 
-# versions containing fix/backport from https://github.com/python/cpython/pull/113563
-# which changed the behavior of `urllib.parse.urlun{parse,split}`
-url = "////path/to/file"
-has_new_urlun_behavior = url == urlunparse(urlparse(url))
-
-# the above change seems to only impact tests on Windows, so just add skips for that
-skip_needs_new_urlun_behavior_win = pytest.mark.skipif(
-    sys.platform != "win32" or not has_new_urlun_behavior,
-    reason="testing windows behavior for newer CPython",
-)
-
-skip_needs_old_urlun_behavior_win = pytest.mark.skipif(
-    sys.platform != "win32" or has_new_urlun_behavior,
-    reason="testing windows behavior for older CPython",
-)
-
 # Trailing slashes are now preserved on Windows, matching POSIX behaviour.
 # BPO: https://github.com/python/cpython/issues/126212
-does_pathname2url_preserve_trailing_slash = pathname2url("C:/foo/").endswith("/")
+does_pathname2url_preserve_trailing_slash = pathname2url("C:\\foo\\").endswith("/")
 skip_needs_new_pathname2url_trailing_slash_behavior_win = pytest.mark.skipif(
     sys.platform != "win32" or not does_pathname2url_preserve_trailing_slash,
     reason="testing windows (pathname2url) behavior for newer CPython",

tests/unit/test_collector.py

@@ -42,9 +42,7 @@
     TestData,
     make_test_link_collector,
     skip_needs_new_pathname2url_trailing_slash_behavior_win,
-    skip_needs_new_urlun_behavior_win,
     skip_needs_old_pathname2url_trailing_slash_behavior_win,
-    skip_needs_old_urlun_behavior_win,
 )
 
 ACCEPT = ", ".join(
@@ -309,7 +307,7 @@ def test_clean_url_path(path: str, expected: str, is_local_path: bool) -> None:
         # Test a VCS path with a Windows drive letter and revision.
         pytest.param(
             "/T:/with space/[email protected]",
-            "///T:/with%20space/[email protected]",
+            "/T:/with%20space/[email protected]",
             marks=pytest.mark.skipif("sys.platform != 'win32'"),
         ),
         # Test a VCS path with a Windows drive letter and revision,
@@ -393,26 +391,12 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "file:///T:/path/with spaces/",
             "file:///T:/path/with%20spaces",
-            marks=[
-                skip_needs_old_urlun_behavior_win,
-                skip_needs_old_pathname2url_trailing_slash_behavior_win,
-            ],
-        ),
-        pytest.param(
-            "file:///T:/path/with spaces/",
-            "file://///T:/path/with%20spaces",
-            marks=[
-                skip_needs_new_urlun_behavior_win,
-                skip_needs_old_pathname2url_trailing_slash_behavior_win,
-            ],
+            marks=skip_needs_old_pathname2url_trailing_slash_behavior_win,
         ),
         pytest.param(
             "file:///T:/path/with spaces/",
-            "file://///T:/path/with%20spaces/",
-            marks=[
-                skip_needs_new_urlun_behavior_win,
-                skip_needs_new_pathname2url_trailing_slash_behavior_win,
-            ],
+            "file:///T:/path/with%20spaces/",
+            marks=skip_needs_new_pathname2url_trailing_slash_behavior_win,
         ),
         # URL with Windows drive letter, running on non-windows
         # platform. The `:` after the drive should be quoted.
@@ -425,18 +409,13 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "git+file:///T:/with space/[email protected]#egg=my-package-1.0",
             "git+file:///T:/with%20space/[email protected]#egg=my-package-1.0",
-            marks=skip_needs_old_urlun_behavior_win,
-        ),
-        pytest.param(
-            "git+file:///T:/with space/[email protected]#egg=my-package-1.0",
-            "git+file://///T:/with%20space/[email protected]#egg=my-package-1.0",
-            marks=skip_needs_new_urlun_behavior_win,
+            marks=pytest.mark.skipif("sys.platform != 'win32'"),
         ),
         # Test a VCS URL with a Windows drive letter and revision,
         # running on non-windows platform.
         pytest.param(
             "git+file:///T:/with space/[email protected]#egg=my-package-1.0",
-            "git+file:/T%3A/with%20space/[email protected]#egg=my-package-1.0",
+            "git+file:///T%3A/with%20space/[email protected]#egg=my-package-1.0",
             marks=pytest.mark.skipif("sys.platform == 'win32'"),
         ),
     ],