merge from 3.5

Issue21221 - Explain the usage of tm_isdst attribute of mktime, with valid
values and meaning.

Patch contributed by Andrew Scheller.
This commit is contained in:
Senthil Kumaran 2016-01-03 00:45:05 -08:00
commit 15777231e9
1 changed files with 5 additions and 3 deletions

View File

@ -555,9 +555,11 @@ The module defines the following functions and data items:
+-------+-------------------+---------------------------------+ +-------+-------------------+---------------------------------+
Note that unlike the C structure, the month value is a range of [1, 12], not Note that unlike the C structure, the month value is a range of [1, 12], not
[0, 11]. A ``-1`` argument as the daylight [0, 11].
savings flag, passed to :func:`mktime` will usually result in the correct
daylight savings state to be filled in. In calls to :func:`mktime`, :attr:`tm_isdst` may be set to 1 when daylight
savings time is in effect, and 0 when it is not. A value of -1 indicates that
this is not known, and will usually result in the correct state being filled in.
When a tuple with an incorrect length is passed to a function expecting a When a tuple with an incorrect length is passed to a function expecting a
:class:`struct_time`, or having elements of the wrong type, a :class:`struct_time`, or having elements of the wrong type, a