Skip to content

Fix utcoffset #66

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 3 commits into from
Oct 31, 2016
Merged

Fix utcoffset #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bcb7a5
Fix utcoffset
regnarock Oct 31, 2016
2d2ad51
Add test for utcoffset
regnarock Oct 31, 2016
299b4dc
Fix test
regnarock Oct 31, 2016
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
2 changes: 1 addition & 1 deletion pendulum/tz/timezone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def utcoffset(self, dt):
elif dt.tzinfo.tz is not self:
dt = self.convert(dt)

return dt.adjusted_offset
return dt.tzinfo.adjusted_offset

return dt.utcoffset(dt)

Expand Down
7 changes: 6 additions & 1 deletion tests/tz_tests/test_timezone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

import pendulum
from datetime import datetime
from datetime import datetime, timedelta
from pendulum import timezone
from pendulum.tz.exceptions import NonExistingTime, AmbiguousTime

Expand Down Expand Up @@ -146,3 +146,8 @@ def test_create_uses_transition_rule(self):
self.assertEqual('Europe/Paris', dt.timezone_name)
self.assertEqual(3600, dt.offset)
self.assertFalse(dt.is_dst)

def test_utcoffset(self):
tz = pendulum.timezone('Europe/Paris')
utcoffset = tz.utcoffset(pendulum.utcnow())
self.assertEqual(utcoffset, timedelta(0, 3600))