From 35b84b4123627bd618fe9d887084b596160d47cc Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Mon, 24 Dec 2007 20:00:42 +0000 Subject: [PATCH] Backport of fix for issue 1695. --- Misc/NEWS | 2 ++ Modules/timemodule.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 230cd47eee7e..dffb879537ac 100644 --- 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 283ab5fd7b7b..be02ec25a7f2 100644 --- 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."); -- 2.47.3