mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix bogus error reporting on strptime: let PyArg_ParseTuple set exception.

Browse source 
Also, wrap long line.
This commit is contained in:
Jeremy Hylton 2000-03-14 21:17:16 +00:00
parent d0d366b5e6
commit 7ceab65468
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Modules/timemodule.c
View file

@ -373,7 +373,8 @@ time_strftime(self, args)
memset((ANY *) &buf, '\0', sizeof(buf));
if (!PyArg_ParseTuple(args, "sO:strftime", &fmt, &tup) || !gettmarg(tup, &buf))
if (!PyArg_ParseTuple(args, "sO:strftime", &fmt, &tup)
|| !gettmarg(tup, &buf))
return NULL;
fmtlen = strlen(fmt);
@ -421,10 +422,8 @@ time_strptime(self, args)
char *buf;
char *s;
if (!PyArg_ParseTuple(args, "s|s:strptime", &buf, &fmt)) {
PyErr_SetString(PyExc_ValueError, "invalid argument");
return NULL;
}
if (!PyArg_ParseTuple(args, "s|s:strptime", &buf, &fmt))
return NULL;
memset((ANY *) &tm, '\0', sizeof(tm));
s = strptime(buf, fmt, &tm);
if (s == NULL) {