Backport of fix for issue 1695.

diff --git a/Misc/NEWS b/Misc/NEWS
index 230cd47eee7ec063be2d504603db252f49c8d798..dffb879537ac4356c7e49b463c481e862a3564fc 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,8 @@ Core and builtins
 Library
 -------
 
+- Issue #1695: Fixed typo in the docstrings for time.localtime() and gmtime().
+
 - Issue #1642: Fix segfault in ctypes when trying to delete attributes.
 
 - os.access now returns True on Windows for any existing directory.

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 283ab5fd7b7b1fb45b6ea7abb4d0b9adc4f5da84..be02ec25a7f2cd9aeea5b7b1b4bfc42b9ef5140e 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -317,7 +317,7 @@ time_gmtime(PyObject *self, PyObject *args)
 }
 
 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\
 \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)
 }
 
 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\
 Convert seconds since the Epoch to a time tuple expressing local time.\n\
 When 'seconds' is not passed in, convert the current time instead.");