Commit b98cda44 authored by Guido van Rossum's avatar Guido van Rossum

Patch #1314 by Christian Heimes.

Fix failing unittests for time and strptime on German and probably other
localized Windows installations.
parent e1a0d11c
...@@ -528,7 +528,8 @@ time_strftime(PyObject *self, PyObject *args) ...@@ -528,7 +528,8 @@ time_strftime(PyObject *self, PyObject *args)
e.g. an empty format, or %Z when the timezone e.g. an empty format, or %Z when the timezone
is unknown. */ is unknown. */
PyObject *ret; PyObject *ret;
ret = PyUnicode_FromStringAndSize(outbuf, buflen); ret = PyUnicode_Decode(outbuf, buflen,
TZNAME_ENCODING, NULL);
PyMem_Free(outbuf); PyMem_Free(outbuf);
return ret; return ret;
} }
...@@ -1035,5 +1036,3 @@ floatsleep(double secs) ...@@ -1035,5 +1036,3 @@ floatsleep(double secs)
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment