Commit b2b42ddc authored by Guido van Rossum's avatar Guido van Rossum

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

only.  Through some mysterious interaction, they would take 9 separate
arguments as well.  This misfeature is now disabled (to end a
difference with JPython).
parent 687ef6e7
...@@ -452,9 +452,12 @@ time_asctime(self, args) ...@@ -452,9 +452,12 @@ time_asctime(self, args)
PyObject *self; PyObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *tup;
struct tm buf; struct tm buf;
char *p; char *p;
if (!gettmarg(args, &buf)) if (!PyArg_ParseTuple(args, "O", &tup))
return NULL;
if (!gettmarg(tup, &buf))
return NULL; return NULL;
p = asctime(&buf); p = asctime(&buf);
if (p[24] == '\n') if (p[24] == '\n')
...@@ -500,11 +503,14 @@ time_mktime(self, args) ...@@ -500,11 +503,14 @@ time_mktime(self, args)
PyObject *self; PyObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *tup;
struct tm buf; struct tm buf;
time_t tt; time_t tt;
if (!PyArg_ParseTuple(args, "O", &tup))
return NULL;
tt = time(&tt); tt = time(&tt);
buf = *localtime(&tt); buf = *localtime(&tt);
if (!gettmarg(args, &buf)) if (!gettmarg(tup, &buf))
return NULL; return NULL;
tt = mktime(&buf); tt = mktime(&buf);
if (tt == (time_t)(-1)) { if (tt == (time_t)(-1)) {
...@@ -529,10 +535,10 @@ static PyMethodDef time_methods[] = { ...@@ -529,10 +535,10 @@ static PyMethodDef time_methods[] = {
{"sleep", time_sleep, 0, sleep_doc}, {"sleep", time_sleep, 0, sleep_doc},
{"gmtime", time_gmtime, 0, gmtime_doc}, {"gmtime", time_gmtime, 0, gmtime_doc},
{"localtime", time_localtime, 0, localtime_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}, {"ctime", time_ctime, 0, ctime_doc},
#ifdef HAVE_MKTIME #ifdef HAVE_MKTIME
{"mktime", time_mktime, 0, mktime_doc}, {"mktime", time_mktime, 1, mktime_doc},
#endif #endif
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
{"strftime", time_strftime, 1, strftime_doc}, {"strftime", time_strftime, 1, strftime_doc},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment