diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2008-03-16 03:45:34 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2008-03-16 03:45:34 (GMT) |
| commit | fc689ddc0d1eb7468dd2dfea71689af1ce05fe46 (patch) | |
| tree | 99603d48bbe73bf0549864cc9a017b39108e17f6 | |
| parent | 0eb6f69fc3d0e827118ed3b070fabbb79902fab2 (diff) | |
| download | cpython-fc689ddc0d1eb7468dd2dfea71689af1ce05fe46.zip cpython-fc689ddc0d1eb7468dd2dfea71689af1ce05fe46.tar.gz cpython-fc689ddc0d1eb7468dd2dfea71689af1ce05fe46.tar.bz2 | |
Fix datetime_strptime following svnmerge from trunk; it was
using the wrong format codes ('s' instead of 'u') in
PyObject_CallMethod.
| -rw-r--r-- | Modules/datetimemodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index 798865d..0317dbf 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]; |