summaryrefslogtreecommitdiff
path: root/Doc/library/time.rst
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2017-01-27 13:05:09 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2017-01-27 13:05:09 +0000
commitd45d8652710e51576367db00b226b8465e6c5ce6 (patch)
treeeeb12605abc98507852e82848382c2e739991708 /Doc/library/time.rst
parent6ccbbb38caa79f9eb9b93b5767f3787fc80cbac1 (diff)
parentbbbab3c96168cea9f872f90da0a385b50f62ca70 (diff)
downloadcpython-d45d8652710e51576367db00b226b8465e6c5ce6.tar.gz
Closes #28784: Merged update from 3.6.
Diffstat (limited to 'Doc/library/time.rst')
-rw-r--r--Doc/library/time.rst9
1 files changed, 7 insertions, 2 deletions
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index ae17f6f4f0..6ef02b7403 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -594,8 +594,13 @@ The module defines the following functions and data items:
.. function:: tzset()
- Resets the time conversion rules used by the library routines. The environment
- variable :envvar:`TZ` specifies how this is done.
+ Reset the time conversion rules used by the library routines. The environment
+ variable :envvar:`TZ` specifies how this is done. It will also set the variables
+ ``tzname`` (from the :envvar:`TZ` environment variable), ``timezone`` (non-DST
+ seconds West of UTC), ``altzone`` (DST seconds west of UTC) and ``daylight``
+ (to 0 if this timezone does not have any daylight saving time rules, or to
+ nonzero if there is a time, past, present or future when daylight saving time
+ applies).
Availability: Unix.