diff options
author | Senthil Kumaran <senthil@uthcode.com> | 2016-01-03 08:43:23 (GMT) |
---|---|---|
committer | Senthil Kumaran <senthil@uthcode.com> | 2016-01-03 08:43:23 (GMT) |
commit | 6ffbcdf13f9dd3c031a26820df773f27e1a3ca3c (patch) | |
tree | 55db3f140ab488ed62f1e5389631883af4ff7c6c /Doc/library/time.rst | |
parent | 830207e8f32df949ec35e2e7f5afe98975e262c9 (diff) | |
parent | a880800363774848f39e1aa316aa4a44fef9c8fc (diff) | |
download | cpython-6ffbcdf13f9dd3c031a26820df773f27e1a3ca3c.zip cpython-6ffbcdf13f9dd3c031a26820df773f27e1a3ca3c.tar.gz cpython-6ffbcdf13f9dd3c031a26820df773f27e1a3ca3c.tar.bz2 |
merge from 3.4
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 3d335c8..8b53bbb 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 |