[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/fb27b7141de0
changeset:   106131:fb27b7141de0
branch:      2.7
parent:      106128:d9539a5c2315
parent:      106119:8578757cc3a6
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Jan 13 09:44:28 2017 +0200
summary:
  Merge heads

files:
  Doc/library/time.rst |  9 +++++++--
  1 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Doc/library/time.rst b/Doc/library/time.rst
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -464,8 +464,13 @@
 
 .. 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).
 
    .. versionadded:: 2.3
 

-- 
Repository URL: https://hg.python.org/cpython