mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 59595-59604 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Christian Heimes 2007-12-28 14:08:13 +00:00
parent f609a345a4
commit 9a37159e51
5 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/timemodule.c
View file

@ -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.");