diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2016-01-03 08:45:05 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2016-01-03 08:45:05 (GMT) |
| commit | 15777231e93948d15ad72f7504e178946be3094d (patch) | |
| tree | 533c1b98300427d4a78d42d9c9d7e1b0890685fe /Doc/library/time.rst | |
| parent | 75f104a74535ddcbc390c4e8362fd7157bace185 (diff) | |
| parent | 6ffbcdf13f9dd3c031a26820df773f27e1a3ca3c (diff) | |
| download | cpython-15777231e93948d15ad72f7504e178946be3094d.zip cpython-15777231e93948d15ad72f7504e178946be3094d.tar.gz cpython-15777231e93948d15ad72f7504e178946be3094d.tar.bz2 | |
merge from 3.5
Issue21221 - Explain the usage of tm_isdst attribute of mktime, with valid
values and meaning.
Patch contributed by Andrew Scheller.
Diffstat (limited to 'Doc/library/time.rst')
| -rw-r--r-- | Doc/library/time.rst | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst index 73436ca..c3c75d5 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -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 - [0, 11]. A ``-1`` argument as the daylight - savings flag, passed to :func:`mktime` will usually result in the correct - daylight savings state to be filled in. + [0, 11]. + + 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 :class:`struct_time`, or having elements of the wrong type, a |