diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-28 14:08:13 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-28 14:08:13 (GMT) |
| commit | 9a37159e51fc436594752ab0e6c6ad4d25df8e4e (patch) | |
| tree | ba47bacea35d0244e2fb7fdbfe91e6e03d0386d3 /Modules/timemodule.c | |
| parent | f609a345a4adaedd5806b4ec8439b84c409b9f66 (diff) | |
| download | cpython-9a37159e51fc436594752ab0e6c6ad4d25df8e4e.zip cpython-9a37159e51fc436594752ab0e6c6ad4d25df8e4e.tar.gz cpython-9a37159e51fc436594752ab0e6c6ad4d25df8e4e.tar.bz2 | |
Merged revisions 59595-59604 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59596 | brett.cannon | 2007-12-24 20:58:25 +0100 (Mon, 24 Dec 2007) | 4 lines
Fix the docstrings of time.localtime() and gmtime() for the tm_mday field.
Will backport.
........
r59598 | brett.cannon | 2007-12-25 00:43:30 +0100 (Tue, 25 Dec 2007) | 3 lines
Make trailing whitespace explicit (including when it is an all-whitespace
line).
........
r59599 | brett.cannon | 2007-12-25 01:14:34 +0100 (Tue, 25 Dec 2007) | 7 lines
Actually execute the tests for the getter/setter/deleter tests on properties.
Also fix the test by having the test classes inherit from object.
Are the getter/setter/deleter attributes supposed to be able to chain? As of
right now they can't as the property tries to call what the property returns,
which is another property when they are chained.
........
r59600 | brett.cannon | 2007-12-25 07:44:59 +0100 (Tue, 25 Dec 2007) | 2 lines
Remove a straggling debugging print line.
........
r59604 | kurt.kaiser | 2007-12-28 05:18:01 +0100 (Fri, 28 Dec 2007) | 2 lines
Configure Dialog: improved layout for keybinding. Patch 1457 Tal Einat.
........
Diffstat (limited to 'Modules/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 36a723a..8854d0d 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -332,7 +332,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\ @@ -348,7 +348,8 @@ 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,\n\ + 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."); |