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 798865d6bc58cf117bda4d4281edf88dd4a3d37a..0317dbfed163d0c826d4224a3d80ce4ebb2a1a3b 100644 (file)
--- 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];