[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/4e8d67c67959
changeset:   73271:4e8d67c67959
parent:      73268:c343c095d08b
parent:      73270:1d47d5fdb633
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Tue Nov 01 10:32:22 2011 +0100
summary:
  merge with 3.2

files:
  Doc/library/datetime.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- 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

-- 
Repository URL: http://hg.python.org/cpython