[Python-checkins] r59597 - in python/branches/release25-maint: Misc/NEWS Modules/timemodule.c

[brett.cannon]

Author: brett.cannon
Date: Mon Dec 24 21:00:42 2007
New Revision: 59597

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/timemodule.c
Log:
Backport of fix for issue 1695.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Mon Dec 24 21:00:42 2007
@@ -51,6 +51,8 @@
 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.

Modified: python/branches/release25-maint/Modules/timemodule.c
==============================================================================
--- python/branches/release25-maint/Modules/timemodule.c	(original)
+++ python/branches/release25-maint/Modules/timemodule.c	Mon Dec 24 21:00:42 2007
@@ -317,7 +317,7 @@
 }
 
 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 @@
 }
 
 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.");