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

The functions asctime() and mktime() are documented to take a 9-tuple

Browse source 
only.  Through some mysterious interaction, they would take 9 separate
arguments as well.  This misfeature is now disabled (to end a
difference with JPython).
This commit is contained in:
Guido van Rossum 2000-01-12 16:38:20 +00:00
parent 687ef6e70b
commit b2b42ddcb1
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/timemodule.c
View file

@ -452,9 +452,12 @@ time_asctime(self, args)
PyObject *self;
PyObject *args;
{
PyObject *tup;
struct tm buf;
char *p;
if (!gettmarg(args, &buf))
if (!PyArg_ParseTuple(args, "O", &tup))
return NULL;
if (!gettmarg(tup, &buf))
return NULL;
p = asctime(&buf);
if (p[24] == '\n')
@ -500,11 +503,14 @@ time_mktime(self, args)
PyObject *self;
PyObject *args;
{
PyObject *tup;
struct tm buf;
time_t tt;
if (!PyArg_ParseTuple(args, "O", &tup))
return NULL;
tt = time(&tt);
buf = *localtime(&tt);
if (!gettmarg(args, &buf))
if (!gettmarg(tup, &buf))
return NULL;
tt = mktime(&buf);
if (tt == (time_t)(-1)) {
@ -529,10 +535,10 @@ static PyMethodDef time_methods[] = {
{"sleep", time_sleep, 0, sleep_doc},
{"gmtime", time_gmtime, 0, gmtime_doc},
{"localtime", time_localtime, 0, localtime_doc},
{"asctime", time_asctime, 0, asctime_doc},
{"asctime", time_asctime, 1, asctime_doc},
{"ctime", time_ctime, 0, ctime_doc},
#ifdef HAVE_MKTIME
{"mktime", time_mktime, 0, mktime_doc},
{"mktime", time_mktime, 1, mktime_doc},
#endif
#ifdef HAVE_STRFTIME
{"strftime", time_strftime, 1, strftime_doc},