From 3bcb7a557fda0059ae0d467d6c50d9cecdb1a97a Mon Sep 17 00:00:00 2001 From: Thomas Wilgenbus Date: Mon, 31 Oct 2016 11:12:00 +0100 Subject: [PATCH 1/3] Fix utcoffset --- pendulum/tz/timezone.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pendulum/tz/timezone.py b/pendulum/tz/timezone.py index d4fd9976..5ad1e53a 100644 --- a/pendulum/tz/timezone.py +++ b/pendulum/tz/timezone.py @@ -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) From 2d2ad515faafbbd60ffaf0311d1468ab2ee44da0 Mon Sep 17 00:00:00 2001 From: Thomas Wilgenbus Date: Mon, 31 Oct 2016 11:24:10 +0100 Subject: [PATCH 2/3] Add test for utcoffset --- tests/tz_tests/test_timezone.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/tz_tests/test_timezone.py b/tests/tz_tests/test_timezone.py index 71d5aede..52ffc2dc 100644 --- a/tests/tz_tests/test_timezone.py +++ b/tests/tz_tests/test_timezone.py @@ -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 @@ -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.utcoffset()) + self.assertEqual(utcoffset, timedelta(0, 3600)) From 299b4dc0a21f73f79ef72c215b4de0c30efee0a3 Mon Sep 17 00:00:00 2001 From: Thomas Wilgenbus Date: Mon, 31 Oct 2016 11:31:04 +0100 Subject: [PATCH 3/3] Fix test --- tests/tz_tests/test_timezone.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tz_tests/test_timezone.py b/tests/tz_tests/test_timezone.py index 52ffc2dc..3169806f 100644 --- a/tests/tz_tests/test_timezone.py +++ b/tests/tz_tests/test_timezone.py @@ -149,5 +149,5 @@ def test_create_uses_transition_rule(self): def test_utcoffset(self): tz = pendulum.timezone('Europe/Paris') - utcoffset = tz.utcoffset(pendulum.utcoffset()) + utcoffset = tz.utcoffset(pendulum.utcnow()) self.assertEqual(utcoffset, timedelta(0, 3600))