[Python-checkins] cpython (2.7): issue13666 - Fixing datetime documentation example when using tzinfo

Tue Jun 26 14:05:33 CEST 2012

http://hg.python.org/cpython/rev/01d180987d90
changeset: 77806:01d180987d90
branch: 2.7
parent: 77787:67dc99a989cd
user: Senthil Kumaran <senthil at uthcode.com>
date: Tue Jun 26 20:05:12 2012 +0800
summary:
 issue13666 - Fixing datetime documentation example when using tzinfo
files:
 Doc/library/datetime.rst | 17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1093,14 +1093,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:
@@ -1109,16 +1109,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):
-- 
Repository URL: http://hg.python.org/cpython
