Commit 35b84b41 authored by Brett Cannon's avatar Brett Cannon

Backport of fix for issue 1695.

parent 4f1cbd27
...@@ -51,6 +51,8 @@ Core and builtins ...@@ -51,6 +51,8 @@ Core and builtins
Library Library
------- -------
- Issue #1695: Fixed typo in the docstrings for time.localtime() and gmtime().
- Issue #1642: Fix segfault in ctypes when trying to delete attributes. - Issue #1642: Fix segfault in ctypes when trying to delete attributes.
- os.access now returns True on Windows for any existing directory. - os.access now returns True on Windows for any existing directory.
......
...@@ -317,7 +317,7 @@ time_gmtime(PyObject *self, PyObject *args) ...@@ -317,7 +317,7 @@ time_gmtime(PyObject *self, PyObject *args)
} }
PyDoc_STRVAR(gmtime_doc, PyDoc_STRVAR(gmtime_doc,
"gmtime([seconds]) -> (tm_year, tm_mon, tm_day, tm_hour, tm_min,\n\ "gmtime([seconds]) -> (tm_year, tm_mon, tm_mday, tm_hour, tm_min,\n\
tm_sec, tm_wday, tm_yday, tm_isdst)\n\ tm_sec, tm_wday, tm_yday, tm_isdst)\n\
\n\ \n\
Convert seconds since the Epoch to a time tuple expressing UTC (a.k.a.\n\ Convert seconds since the Epoch to a time tuple expressing UTC (a.k.a.\n\
...@@ -333,7 +333,7 @@ time_localtime(PyObject *self, PyObject *args) ...@@ -333,7 +333,7 @@ time_localtime(PyObject *self, PyObject *args)
} }
PyDoc_STRVAR(localtime_doc, PyDoc_STRVAR(localtime_doc,
"localtime([seconds]) -> (tm_year,tm_mon,tm_day,tm_hour,tm_min,tm_sec,tm_wday,tm_yday,tm_isdst)\n\ "localtime([seconds]) -> (tm_year,tm_mon,tm_mday,tm_hour,tm_min,tm_sec,tm_wday,tm_yday,tm_isdst)\n\
\n\ \n\
Convert seconds since the Epoch to a time tuple expressing local time.\n\ Convert seconds since the Epoch to a time tuple expressing local time.\n\
When 'seconds' is not passed in, convert the current time instead."); When 'seconds' is not passed in, convert the current time instead.");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment