merge with 3.2

This commit is contained in:
Sandro Tosi 2011-11-01 10:32:22 +01:00
commit b6dbc9ee15
1 changed files with 2 additions and 2 deletions

View File

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