main commit

venv/lib/python3.12/site-packages/celery/utils/time.py

@@ -14,7 +14,6 @@ from types import ModuleType
 from typing import Any, Callable
 
 from dateutil import tz as dateutil_tz
-from dateutil.parser import isoparse
 from kombu.utils.functional import reprcall
 from kombu.utils.objects import cached_property
 
@@ -41,9 +40,6 @@ C_REMDEBUG = os.environ.get('C_REMDEBUG', False)
 DAYNAMES = 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'
 WEEKDAYS = dict(zip(DAYNAMES, range(7)))
 
-MONTHNAMES = 'jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'
-YEARMONTHS = dict(zip(MONTHNAMES, range(1, 13)))
-
 RATE_MODIFIER_MAP = {
     's': lambda n: n,
     'm': lambda n: n / 60.0,
@@ -204,7 +200,7 @@ def delta_resolution(dt: datetime, delta: timedelta) -> datetime:
 def remaining(
         start: datetime, ends_in: timedelta, now: Callable | None = None,
         relative: bool = False) -> timedelta:
-    """Calculate the real remaining time for a start date and a timedelta.
+    """Calculate the remaining time for a start date and a timedelta.
 
     For example, "how many seconds left for 30 seconds after start?"
 
@@ -215,28 +211,24 @@ def remaining(
             using :func:`delta_resolution` (i.e., rounded to the
             resolution of `ends_in`).
         now (Callable): Function returning the current time and date.
-            Defaults to :func:`datetime.now(timezone.utc)`.
+            Defaults to :func:`datetime.utcnow`.
 
     Returns:
         ~datetime.timedelta: Remaining time.
     """
-    now = now or datetime.now(datetime_timezone.utc)
+    now = now or datetime.utcnow()
+    if str(
+            start.tzinfo) == str(
+            now.tzinfo) and now.utcoffset() != start.utcoffset():
+        # DST started/ended
+        start = start.replace(tzinfo=now.tzinfo)
     end_date = start + ends_in
     if relative:
         end_date = delta_resolution(end_date, ends_in).replace(microsecond=0)
-
-    # Using UTC to calculate real time difference.
-    # Python by default uses wall time in arithmetic between datetimes with
-    # equal non-UTC timezones.
-    now_utc = now.astimezone(timezone.utc)
-    end_date_utc = end_date.astimezone(timezone.utc)
-    ret = end_date_utc - now_utc
+    ret = end_date - now
     if C_REMDEBUG:  # pragma: no cover
-        print(
-            'rem: NOW:{!r} NOW_UTC:{!r} START:{!r} ENDS_IN:{!r} '
-            'END_DATE:{} END_DATE_UTC:{!r} REM:{}'.format(
-                now, now_utc, start, ends_in, end_date, end_date_utc, ret)
-        )
+        print('rem: NOW:{!r} START:{!r} ENDS_IN:{!r} END_DATE:{} REM:{}'.format(
+            now, start, ends_in, end_date, ret))
     return ret
 
 
@@ -265,21 +257,6 @@ def weekday(name: str) -> int:
         raise KeyError(name)
 
 
-def yearmonth(name: str) -> int:
-    """Return the position of a month: 1 - 12, where 1 is January.
-
-    Example:
-        >>> yearmonth('january'), yearmonth('jan'), yearmonth('may')
-        (1, 1, 5)
-    """
-    abbreviation = name[0:3].lower()
-    try:
-        return YEARMONTHS[abbreviation]
-    except KeyError:
-        # Show original day name in exception, instead of abbr.
-        raise KeyError(name)
-
-
 def humanize_seconds(
         secs: int, prefix: str = '', sep: str = '', now: str = 'now',
         microseconds: bool = False) -> str:
@@ -311,7 +288,7 @@ def maybe_iso8601(dt: datetime | str | None) -> None | datetime:
         return
     if isinstance(dt, datetime):
         return dt
-    return isoparse(dt)
+    return datetime.fromisoformat(dt)
 
 
 def is_naive(dt: datetime) -> bool:
@@ -325,7 +302,7 @@ def _can_detect_ambiguous(tz: tzinfo) -> bool:
     return isinstance(tz, ZoneInfo) or hasattr(tz, "is_ambiguous")
 
 
-def _is_ambiguous(dt: datetime, tz: tzinfo) -> bool:
+def _is_ambigious(dt: datetime, tz: tzinfo) -> bool:
     """Helper function to determine if a timezone is ambiguous using python's dateutil module.
 
     Returns False if the timezone cannot detect ambiguity, or if there is no ambiguity, otherwise True.
@@ -342,7 +319,7 @@ def make_aware(dt: datetime, tz: tzinfo) -> datetime:
     """Set timezone for a :class:`~datetime.datetime` object."""
 
     dt = dt.replace(tzinfo=tz)
-    if _is_ambiguous(dt, tz):
+    if _is_ambigious(dt, tz):
         dt = min(dt.replace(fold=0), dt.replace(fold=1))
     return dt