Skip to content

Fix instance() behaviour with pytz offsets #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2017
Merged

Fix instance() behaviour with pytz offsets #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pendulum/pendulum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,13 @@ def instance(cls, dt, tz=UTC):
# Checking for pytz/tzinfo
if isinstance(tz, datetime.tzinfo) and not isinstance(tz, (Timezone, TimezoneInfo)):
# pytz
if hasattr(tz, 'localize'):
if hasattr(tz, 'localize') and tz.zone:
tz = tz.zone
else:
# We have no sure way to figure out
# the timezone name, we fallback
# on a fixed offset
tz = dt.utcoffset().total_seconds() / 3600
tz = tz.utcoffset(dt).total_seconds() / 3600

return cls(
dt.year, dt.month, dt.day,
Expand Down
19 changes: 19 additions & 0 deletions tests/pendulum_tests/test_construct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,25 @@ def test_instance_timezone_aware_datetime_pytz(self):
)
self.assertEqual('Europe/Paris', now.timezone_name)

def test_instance_timezone_aware_datetime_pytz_offset(self):
# Impossible timezone of +21 (won't accidentally match the local offset)
fixed_offset = pytz.FixedOffset(21 * 60)

now = Pendulum.instance(
datetime.now(fixed_offset)
)
self.assertEqual(21, now.offset_hours)

now = Pendulum.instance(
datetime.now(), fixed_offset
)
self.assertEqual(21, now.offset_hours)

now = Pendulum.instance(
datetime.now(fixed_offset), pytz.timezone('Europe/Paris')
)
self.assertEqual(21, now.offset_hours)

def test_instance_timezone_aware_datetime_any_tzinfo(self):
dt = datetime(2016, 8, 7, 12, 34, 56, tzinfo=tz.gettz('Europe/Paris'))
now = Pendulum.instance(dt)
Expand Down