From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 14 Mar 2000 21:17:16 +0000 (+0000)
Subject: Fix bogus error reporting on strptime: let PyArg_ParseTuple set exception.
X-Git-Tag: v1.6a1~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ceab654684eb3041c3d1e25ea860b7bd76daa2f;p=thirdparty%2FPython%2Fcpython.git

Fix bogus error reporting on strptime: let PyArg_ParseTuple set exception.
Also, wrap long line.
---

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 392f2b9819d1..d5a598b6b79a 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -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) {