commit b6dbc9ee15d5d96ce3fb14f5257b447291b989aa
author Sandro Tosi <sandro.tosi@gmail.com> Tue Nov 01 10:32:22 2011 +0100
committer Sandro Tosi <sandro.tosi@gmail.com> Tue Nov 01 10:32:22 2011 +0100
tree f3b8f02f84e448e3e8bf2da3563badbccde1f9b7
parent d61f9d171579e22c65a8fe6347a39d7a5496dc42
parent 4bfe03a42e4cc7e0c0504db520c6d68b302d67bd

merge with 3.2

Doc/library/datetime.rst

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 @@
 
    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