Merge heads

43d84ea0 · Serhiy Storchaka · 7a7e04e4 · a6f10ca4 · 43d84ea0
Kaydet (Commit) 43d84ea0 authored Ock 13, 2017 tarafından Serhiy Storchaka
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

time.rst Doc/library/time.rst +7 -2

No files found.
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -464,8 +464,13 @@ The module defines the following functions and data items:
 .. function:: tzset()
-   Resets the time conversion rules used by the library routines. The environment
+   Reset the time conversion rules used by the library routines. The environment
-   variable :envvar:`TZ` specifies how this is done.
+   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