Change default to UTC, fix linting

Author: notatallshaw

src/pip/_internal/cli/cmdoptions.py

@@ -805,13 +805,16 @@ def _handle_exclude_newer_than(
     Process a value provided for the --exclude-newer-than option.
 
     This is an optparse.Option callback for the --exclude-newer-than option.
+
+    Parses an ISO 8601 datetime string. If no timezone is specified in the string,
+    UTC timezone is applied automatically for consistency with PyPI upload times.
     """
     if value is None:
         return None
     exclude_newer_than = datetime.datetime.fromisoformat(value)
-    # Assume local timezone if no offset is given in the ISO string.
+    # Assume UTC timezone if no offset is given in the ISO string.
     if exclude_newer_than.tzinfo is None:
-        exclude_newer_than = exclude_newer_than.astimezone()
+        exclude_newer_than = exclude_newer_than.replace(tzinfo=datetime.timezone.utc)
     parser.values.exclude_newer_than = exclude_newer_than
 
 
@@ -823,7 +826,11 @@ def _handle_exclude_newer_than(
     action="callback",
     callback=_handle_exclude_newer_than,
     type="str",
-    help="Exclude packages newer than given time. This should be an ISO 8601 string.",
+    help=(
+        "Exclude packages newer than given time. "
+        "This should be an ISO 8601 string. "
+        "If no timezone is specified, UTC is assumed."
+    ),
 )
 
 no_build_isolation: Callable[..., Option] = partial(

src/pip/_internal/cli/req_command.py

@@ -5,6 +5,8 @@
 PackageFinder machinery and all its vendored dependencies, etc.
 """
 
+from __future__ import annotations
+
 import datetime
 import logging
 from functools import partial

src/pip/_internal/commands/index.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 import datetime
+import json
 import logging
 from collections.abc import Iterable
 from optparse import Values

src/pip/_internal/commands/list.py

@@ -145,8 +145,8 @@ def handle_pip_version_check(self, options: Values) -> None:
     def _build_package_finder(
         self,
         options: Values,
-        session: "PipSession",
-    ) -> "PackageFinder":
+        session: PipSession,
+    ) -> PackageFinder:
         """
         Create a package finder appropriate to this list command.
         """

src/pip/_internal/index/package_finder.py

@@ -1,4 +1,5 @@
 """Routines related to PyPI, indexes"""
+
 from __future__ import annotations
 
 import datetime
@@ -132,8 +133,8 @@ def __init__(
         formats: frozenset[str],
         target_python: TargetPython,
         allow_yanked: bool,
-        ignore_requires_python: Optional[bool] = None,
-        exclude_newer_than: Optional[datetime.datetime] = None,
+        ignore_requires_python: bool | None = None,
+        exclude_newer_than: datetime.datetime | None = None,
     ) -> None:
         """
         :param project_name: The user supplied package name.
@@ -152,6 +153,8 @@ def __init__(
             PEP 503 "data-requires-python" values in HTML links. Defaults
             to False.
         :param exclude_newer_than: If set, only allow links prior to the given date.
+            This should be a timezone-aware datetime. If a timezone-naive datetime
+            is provided to the command line option, UTC is assumed.
         """
         if ignore_requires_python is None:
             ignore_requires_python = False
@@ -181,8 +184,15 @@ def evaluate_link(self, link: Link) -> tuple[LinkType, str]:
             return (LinkType.yanked, f"yanked for reason: {reason}")
 
         if link.upload_time is not None and self._exclude_newer_than is not None:
-            if link.upload_time > self._exclude_newer_than:
-                reason = f"Upload time {link.upload_time} after {self._exclude_newer_than}"
+            upload_time = link.upload_time
+            assert upload_time.tzinfo is not None
+            exclude_cutoff = self._exclude_newer_than
+            assert exclude_cutoff.tzinfo is not None
+
+            if upload_time > exclude_cutoff:
+                reason = (
+                    f"Upload time {link.upload_time} after {self._exclude_newer_than}"
+                )
                 return (LinkType.upload_too_late, reason)
 
         if link.egg_fragment:
@@ -599,10 +609,10 @@ def __init__(
         link_collector: LinkCollector,
         target_python: TargetPython,
         allow_yanked: bool,
-        format_control: Optional[FormatControl] = None,
-        candidate_prefs: Optional[CandidatePreferences] = None,
-        ignore_requires_python: Optional[bool] = None,
-        exclude_newer_than: Optional[datetime.datetime] = None,
+        format_control: FormatControl | None = None,
+        candidate_prefs: CandidatePreferences | None = None,
+        ignore_requires_python: bool | None = None,
+        exclude_newer_than: datetime.datetime | None = None,
     ) -> None:
         """
         This constructor is primarily meant to be used by the create() class
@@ -647,9 +657,9 @@ def create(
         cls,
         link_collector: LinkCollector,
         selection_prefs: SelectionPreferences,
-        target_python: Optional[TargetPython] = None,
-        exclude_newer_than: Optional[datetime.datetime] = None,
-    ) -> "PackageFinder":
+        target_python: TargetPython | None = None,
+        exclude_newer_than: datetime.datetime | None = None,
+    ) -> PackageFinder:
         """Create a PackageFinder.
 
         :param selection_prefs: The candidate selection preferences, as a

src/pip/_internal/models/link.py

@@ -10,11 +10,7 @@
 import urllib.parse
 from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    NamedTuple,
-)
+from typing import TYPE_CHECKING, Any, NamedTuple
 
 from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filetypes import WHEEL_EXTENSION
@@ -216,11 +212,11 @@ class Link:
     def __init__(
         self,
         url: str,
-        comes_from: Optional[Union[str, "IndexContent"]] = None,
-        requires_python: Optional[str] = None,
-        yanked_reason: Optional[str] = None,
-        metadata_file_data: Optional[MetadataFile] = None,
-        upload_time: Optional[datetime.datetime] = None,
+        comes_from: str | IndexContent | None = None,
+        requires_python: str | None = None,
+        yanked_reason: str | None = None,
+        metadata_file_data: MetadataFile | None = None,
+        upload_time: datetime.datetime | None = None,
         cache_link_parsing: bool = True,
         hashes: Mapping[str, str] | None = None,
     ) -> None:
@@ -306,7 +302,7 @@ def from_json(
         if metadata_info is None:
             metadata_info = file_data.get("dist-info-metadata")
 
-        upload_time: Optional[datetime.datetime]
+        upload_time: datetime.datetime | None
         if upload_time_data := file_data.get("upload-time"):
             upload_time = datetime.datetime.fromisoformat(upload_time_data)
         else: