Skip to content

Commit 019c36d

Browse files
committed
Fix handling of pytz timezones
1 parent 3698fcb commit 019c36d

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## [Unreleased]
4+
5+
### Fixed
6+
7+
- Fixed handling of `pytz` timezones.
8+
9+
310
## [2.0.2] - 2018-05-29
411

512
### Fixed

pendulum/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _safe_timezone(obj):
7070
elif isinstance(obj, _datetime.tzinfo):
7171
# pytz
7272
if hasattr(obj, 'localize'):
73-
obj = timezone(obj.zone)
73+
obj = obj.zone
7474
else:
7575
offset = obj.utcoffset(None)
7676

tests/test_main.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import pytz
2+
3+
from pendulum import _safe_timezone
4+
from pendulum.tz.timezone import Timezone
5+
6+
7+
def test_safe_timezone_with_tzinfo_objects():
8+
tz = _safe_timezone(pytz.timezone("Europe/Paris"))
9+
10+
assert isinstance(tz, Timezone)
11+
assert "Europe/Paris" == tz.name

0 commit comments

Comments
 (0)