diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2011-11-01 09:32:22 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2011-11-01 09:32:22 (GMT) |
| commit | b6dbc9ee15d5d96ce3fb14f5257b447291b989aa (patch) | |
| tree | f3b8f02f84e448e3e8bf2da3563badbccde1f9b7 /Doc/library | |
| parent | d61f9d171579e22c65a8fe6347a39d7a5496dc42 (diff) | |
| parent | 4bfe03a42e4cc7e0c0504db520c6d68b302d67bd (diff) | |
| download | cpython-b6dbc9ee15d5d96ce3fb14f5257b447291b989aa.zip cpython-b6dbc9ee15d5d96ce3fb14f5257b447291b989aa.tar.gz cpython-b6dbc9ee15d5d96ce3fb14f5257b447291b989aa.tar.bz2 | |
merge with 3.2
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/datetime.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index de034ff..a6c1997 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1438,13 +1438,13 @@ methods. Exactly which methods are needed depends on the uses made of aware Most implementations of :meth:`dst` will probably look like one of these two:: - def dst(self): + def dst(self, dt): # a fixed-offset class: doesn't account for DST return timedelta(0) or :: - def dst(self): + def dst(self, dt): # Code to set dston and dstoff to the time zone's DST # transition times based on the input dt.year, and expressed # in standard local time. Then |