Merged revisions 79184-79185 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79184 | georg.brandl | 2010-03-21 10:58:36 +0100 (So, 21 Mär 2010) | 1 line

  Update text for newest US DST regulation.  The sample file already has the calculation right.
........
  r79185 | georg.brandl | 2010-03-21 11:02:47 +0100 (So, 21 Mär 2010) | 1 line

  Include structmember.h correctly.
........
This commit is contained in:
Georg Brandl 2010-03-21 10:03:36 +00:00
parent ff24c8e11e
commit 7bc6e4fd06
2 changed files with 3 additions and 3 deletions

View File

@ -236,7 +236,7 @@ This version of the module has a number of changes.
We've added an extra include::
#include "structmember.h"
#include <structmember.h>
This include provides declarations that we use to handle attributes, as
described a bit later.

View File

@ -1454,8 +1454,8 @@ Example :class:`tzinfo` classes:
Note that there are unavoidable subtleties twice per year in a :class:`tzinfo`
subclass accounting for both standard and daylight time, at the DST transition
points. For concreteness, consider US Eastern (UTC -0500), where EDT begins the
minute after 1:59 (EST) on the first Sunday in April, and ends the minute after
1:59 (EDT) on the last Sunday in October::
minute after 1:59 (EST) on the second Sunday in March, and ends the minute after
1:59 (EDT) on the first Sunday in November::
UTC 3:MM 4:MM 5:MM 6:MM 7:MM 8:MM
EST 22:MM 23:MM 0:MM 1:MM 2:MM 3:MM