summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Bishop <stuart@stuartbishop.net>2012-03-05 16:46:05 +0700
committerStuart Bishop <stuart@stuartbishop.net>2012-03-05 16:46:05 +0700
commitbdd84cdedc7fd0cef16b5fad1c1696491fb300fb (patch)
tree3a4e1e35fdb7e91d560eb19f16d2fbdafeb2480f
parent802a987b8d45bbd787eb10802e633ad9841b64ec (diff)
downloadpytz-bdd84cdedc7fd0cef16b5fad1c1696491fb300fb.tar.gz
Fail correctly if DstTzInfo.fromutc() is called with a datetime with a non-DstTzInfo timezone
-rw-r--r--src/pytz/tzinfo.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pytz/tzinfo.py b/src/pytz/tzinfo.py
index b61bb39..a1e43cd 100644
--- a/src/pytz/tzinfo.py
+++ b/src/pytz/tzinfo.py
@@ -178,7 +178,8 @@ class DstTzInfo(BaseTzInfo):
def fromutc(self, dt):
'''See datetime.tzinfo.fromutc'''
- if dt.tzinfo is not None and dt.tzinfo._tzinfos is not self._tzinfos:
+ if (dt.tzinfo is not None
+ and getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
raise ValueError('fromutc: dt.tzinfo is not self')
dt = dt.replace(tzinfo=None)
idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)