-r pylock: refine filename pylock-ness test

sbidoul · sbidoul · commit 3517841c5e2d · 2026-04-26T13:57:01.000+02:00
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
@@ -22,7 +22,6 @@
 from textwrap import dedent
 from typing import Any, Callable
 
-from pip._vendor.packaging import pylock
 from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.cli.parser import ConfigOptionParser
@@ -32,6 +31,7 @@
 from pip._internal.models.index import PyPI
 from pip._internal.models.release_control import ReleaseControl
 from pip._internal.models.target_python import TargetPython
+from pip._internal.utils import pylock as pylock_utils
 from pip._internal.utils.datetime import parse_iso_datetime
 from pip._internal.utils.hashes import STRONG_HASHES
 from pip._internal.utils.misc import strtobool
@@ -105,8 +105,7 @@ def check_dist_restriction(options: Values, check_target: bool = False) -> None:
             )
 
     for filename in options.requirements:
-        # TODO: filename may be a URL, so pathlib.Path may not be entirely correct
-        if dist_restriction_set and pylock.is_valid_pylock_path(pathlib.Path(filename)):
+        if dist_restriction_set and pylock_utils.is_valid_pylock_filename(filename):
             raise CommandError(
                 "Patform and interpreter constraints using "
                 "--python-version, --platform, --abi, or --implementation, "
diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
@@ -11,11 +11,8 @@
 import os
 from functools import partial
 from optparse import Values
-from pathlib import Path
 from typing import Any, Callable, TypeVar
 
-from pip._vendor.packaging import pylock
-
 from pip._internal.build_env import (
     BuildEnvironmentInstaller,
     InprocessBuildEnvironmentInstaller,
@@ -51,7 +48,10 @@
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.resolution.base import BaseResolver
 from pip._internal.utils.packaging import check_requires_python
-from pip._internal.utils.pylock import select_from_pylock_path_or_url
+from pip._internal.utils.pylock import (
+    is_valid_pylock_filename,
+    select_from_pylock_path_or_url,
+)
 from pip._internal.utils.temp_dir import (
     TempDirectory,
     TempDirectoryTypeRegistry,
@@ -337,8 +337,7 @@ def get_requirements(
 
         # NOTE: options.require_hashes may be set if --require-hashes is True
         for filename in options.requirements:
-            # TODO: filename may be a URL, so pathlib.Path may not be entirely correct
-            if pylock.is_valid_pylock_path(Path(filename)):
+            if is_valid_pylock_filename(filename):
                 logger.warning(
                     "Using pylock.toml as a requirements source "
                     "is an experimental feature. "
diff --git a/src/pip/_internal/utils/pylock.py b/src/pip/_internal/utils/pylock.py
@@ -15,17 +15,18 @@
     PackageVcs,
     PackageWheel,
     Pylock,
+    is_valid_pylock_path,
 )
 from pip._vendor.packaging.version import Version
 
 from pip._internal.exceptions import InstallationError
 from pip._internal.models.link import Link
-from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.compat import tomllib
 from pip._internal.utils.urls import path_to_url, url_to_path
 
 if TYPE_CHECKING:
     from pip._internal.network.session import PipSession
+    from pip._internal.req.req_install import InstallRequirement
 
 
 def _pylock_package_from_install_requirement(
@@ -135,6 +136,14 @@ def _is_url(s: str) -> bool:
     return bool(_SCHEME_RE.match(s))
 
 
+def is_valid_pylock_filename(filename: str) -> bool:
+    if _is_url(filename):
+        path = Path(urlsplit(filename).path.rpartition("/")[-1])
+    else:
+        path = Path(filename)
+    return is_valid_pylock_path(path)
+
+
 def _package_dist_url(
     pylock_path_or_url: str, path: str | None, url: str | None
 ) -> str:
