issue13666 - merge from 3.2
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 02633cd..7c0aac3 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1203,14 +1203,14 @@
>>> from datetime import timedelta, datetime, tzinfo
>>> class GMT1(tzinfo):
- ... def __init__(self): # DST starts last Sunday in March
+ ... def utcoffset(self, dt):
+ ... return timedelta(hours=1) + self.dst(dt)
+ ... def dst(self, dt):
+ ... # DST starts last Sunday in March
... d = datetime(dt.year, 4, 1) # ends last Sunday in October
... self.dston = d - timedelta(days=d.weekday() + 1)
... d = datetime(dt.year, 11, 1)
... self.dstoff = d - timedelta(days=d.weekday() + 1)
- ... def utcoffset(self, dt):
- ... return timedelta(hours=1) + self.dst(dt)
- ... def dst(self, dt):
... if self.dston <= dt.replace(tzinfo=None) < self.dstoff:
... return timedelta(hours=1)
... else:
@@ -1219,16 +1219,15 @@
... return "GMT +1"
...
>>> class GMT2(tzinfo):
- ... def __init__(self):
+ ... def utcoffset(self, dt):
+ ... return timedelta(hours=2) + self.dst(dt)
+ ... def dst(self, dt):
... d = datetime(dt.year, 4, 1)
... self.dston = d - timedelta(days=d.weekday() + 1)
... d = datetime(dt.year, 11, 1)
... self.dstoff = d - timedelta(days=d.weekday() + 1)
- ... def utcoffset(self, dt):
- ... return timedelta(hours=1) + self.dst(dt)
- ... def dst(self, dt):
... if self.dston <= dt.replace(tzinfo=None) < self.dstoff:
- ... return timedelta(hours=2)
+ ... return timedelta(hours=1)
... else:
... return timedelta(0)
... def tzname(self,dt):
@@ -1628,7 +1627,7 @@
3:00. A wall time of the form 2:MM doesn't really make sense on that day, so
``astimezone(Eastern)`` won't deliver a result with ``hour == 2`` on the day DST
begins. In order for :meth:`astimezone` to make this guarantee, the
-:meth:`rzinfo.dst` method must consider times in the "missing hour" (2:MM for
+:meth:`tzinfo.dst` method must consider times in the "missing hour" (2:MM for
Eastern) to be in daylight time.
When DST ends (the "end" line), there's a potentially worse problem: there's an