diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-10-11 13:50:21 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2017-10-11 13:50:21 (GMT) |
| commit | 764969a4b9ed7c6d2adbc04269f9b4fa392a1eed (patch) | |
| tree | 5a4dd1cfbf06f5fcb3a2481f8d41e393fd728533 /Modules | |
| parent | 10eb14e2c5fe08c4193668530eaef156e07c3674 (diff) | |
| download | cpython-764969a4b9ed7c6d2adbc04269f9b4fa392a1eed.zip cpython-764969a4b9ed7c6d2adbc04269f9b4fa392a1eed.tar.gz cpython-764969a4b9ed7c6d2adbc04269f9b4fa392a1eed.tar.bz2 | |
[3.6] bpo-28157: Improvements for the time module documentation (GH-928)
* Separated functions and constants descriptions in sections.
* Added a note about the limitations of timezone constants.
* Removed redundant lists from the module docstring.
(cherry picked from commit 703ff381ffa946c23e7e25b0ae93a636a2607a40)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/timemodule.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index d6c34b9..0abe569 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -1316,28 +1316,7 @@ The tuple items are:\n\ DST (Daylight Savings Time) flag (-1, 0 or 1)\n\ If the DST flag is 0, the time is given in the regular time zone;\n\ if it is 1, the time is given in the DST time zone;\n\ -if it is -1, mktime() should guess based on the date and time.\n\ -\n\ -Variables:\n\ -\n\ -timezone -- difference in seconds between UTC and local standard time\n\ -altzone -- difference in seconds between UTC and local DST time\n\ -daylight -- whether local time should reflect DST\n\ -tzname -- tuple of (standard time zone name, DST time zone name)\n\ -\n\ -Functions:\n\ -\n\ -time() -- return current time in seconds since the Epoch as a float\n\ -clock() -- return CPU time since process start as a float\n\ -sleep() -- delay for a number of seconds given as a float\n\ -gmtime() -- convert seconds since Epoch to UTC tuple\n\ -localtime() -- convert seconds since Epoch to local time tuple\n\ -asctime() -- convert time tuple to string\n\ -ctime() -- convert time in seconds to string\n\ -mktime() -- convert local time tuple to seconds since Epoch\n\ -strftime() -- convert time tuple to string according to format specification\n\ -strptime() -- parse string to time tuple according to format specification\n\ -tzset() -- change the local timezone"); +if it is -1, mktime() should guess based on the date and time.\n"); |