Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/pendulum/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,17 @@ def _safe_timezone(
obj = obj.key
# pytz
elif hasattr(obj, "localize"):
obj = obj.zone # type: ignore[attr-defined]
# Named pytz zones expose a ``zone`` name, but fixed-offset zones
# (``pytz.FixedOffset``) have ``zone = None``; use their offset.
if obj.zone is not None: # type: ignore[attr-defined]
obj = obj.zone # type: ignore[attr-defined]
else:
offset = obj.utcoffset(dt)

if offset is None:
offset = _datetime.timedelta(0)

obj = int(offset.total_seconds())
elif obj.tzname(None) == "UTC":
return UTC
else:
Expand Down
31 changes: 31 additions & 0 deletions tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from datetime import date
from datetime import datetime
from datetime import time
from datetime import timedelta
from datetime import tzinfo

from dateutil import tz

Expand Down Expand Up @@ -36,6 +38,35 @@ def test_instance_with_aware_datetime_any_tzinfo() -> None:
assert now.timezone_name == "+02:00"


class PytzLikeFixedOffset(tzinfo):
zone: str | None = None

def __init__(self, minutes: int) -> None:
self._offset = timedelta(minutes=minutes)

def localize(self, dt: datetime) -> datetime:
return dt.replace(tzinfo=self)

def utcoffset(self, dt: datetime | None) -> timedelta:
return self._offset

def dst(self, dt: datetime | None) -> timedelta:
return timedelta(0)

def tzname(self, dt: datetime | None) -> str:
return str(self._offset)


def test_instance_with_pytz_like_fixed_offset() -> None:
# ``pytz.FixedOffset`` has a ``localize`` method but no ``zone`` name,
# which used to raise ``AttributeError`` in ``_safe_timezone`` (#807).
dt = pendulum.instance(datetime(2021, 2, 3, tzinfo=PytzLikeFixedOffset(60)))
assert dt.utcoffset() == timedelta(minutes=60)

dt = pendulum.instance(datetime(2021, 2, 3, tzinfo=PytzLikeFixedOffset(-330)))
assert dt.utcoffset() == timedelta(minutes=-330)


def test_instance_with_date() -> None:
dt = pendulum.instance(date(2022, 12, 23))

Expand Down