From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 16 Mar 2008 03:45:34 +0000 (+0000)
Subject: Fix datetime_strptime following svnmerge from trunk;  it was
X-Git-Tag: v3.0a4~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc689ddc0d1eb7468dd2dfea71689af1ce05fe46;p=thirdparty%2FPython%2Fcpython.git

Fix datetime_strptime following svnmerge from trunk;  it was
using the wrong format codes ('s' instead of 'u') in
PyObject_CallMethod.
---

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 798865d6bc58..0317dbfed163 100644
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -3842,7 +3842,7 @@ datetime_strptime(PyObject *cls, PyObject *args)
 	/* _strptime._strptime returns a two-element tuple.  The first
 	   element is a time.struct_time object.  The second is the
 	   microseconds (which are not defined for time.struct_time). */
-	obj = PyObject_CallMethod(module, "_strptime", "ss", string, format);
+	obj = PyObject_CallMethod(module, "_strptime", "uu", string, format);
 	if (obj != NULL) {
 		int i, good_timetuple = 1;
 		long int ia[7];