bpo-29240: Ignore UTF-8 Mode in time module (#5148)

vstinner · web-flow · commit cb3ae5588bd7 · 2018-01-11T10:37:59.000+01:00
time.strftime() must use the current LC_CTYPE encoding, not UTF-8
if the UTF-8 mode is enabled.

Add _PyUnicode_DecodeCurrentLocale() function.
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
@@ -1811,6 +1811,10 @@ PyAPI_FUNC(PyObject*) PyUnicode_EncodeLocale(
     const char *errors
     );
 
+PyAPI_FUNC(PyObject*) _PyUnicode_DecodeCurrentLocale(
+    const char *str,
+    const char *errors);
+
 PyAPI_FUNC(PyObject*) _PyUnicode_DecodeCurrentLocaleAndSize(
     const char *str,
     Py_ssize_t len,
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -138,8 +138,7 @@ encode(PyObject *b)
 static PyObject *
 decode(const char *s)
 {
-    return _PyUnicode_DecodeCurrentLocaleAndSize(s, strlen(s),
-                                                 "surrogateescape");
+    return _PyUnicode_DecodeCurrentLocale(s, "surrogateescape");
 }
 
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -418,11 +418,11 @@ tmtotuple(struct tm *p
     SET(8, p->tm_isdst);
 #ifdef HAVE_STRUCT_TM_TM_ZONE
     PyStructSequence_SET_ITEM(v, 9,
-        PyUnicode_DecodeLocale(p->tm_zone, "surrogateescape"));
+        _PyUnicode_DecodeCurrentLocale(p->tm_zone, "surrogateescape"));
     SET(10, p->tm_gmtoff);
 #else
     PyStructSequence_SET_ITEM(v, 9,
-        PyUnicode_DecodeLocale(zone, "surrogateescape"));
+        _PyUnicode_DecodeCurrentLocale(zone, "surrogateescape"));
     PyStructSequence_SET_ITEM(v, 10, _PyLong_FromTime_t(gmtoff));
 #endif /* HAVE_STRUCT_TM_TM_ZONE */
 #undef SET
@@ -809,8 +809,8 @@ time_strftime(PyObject *self, PyObject *args)
 #ifdef HAVE_WCSFTIME
             ret = PyUnicode_FromWideChar(outbuf, buflen);
 #else
-            ret = PyUnicode_DecodeLocaleAndSize(outbuf, buflen,
-                                                "surrogateescape");
+            ret = _PyUnicode_DecodeCurrentLocaleAndSize(outbuf, buflen,
+                                                        "surrogateescape");
 #endif
             PyMem_Free(outbuf);
             break;
@@ -1541,8 +1541,8 @@ PyInit_timezone(PyObject *m) {
     PyModule_AddIntConstant(m, "altzone", timezone-3600);
 #endif
     PyModule_AddIntConstant(m, "daylight", daylight);
-    otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape");
-    otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape");
+    otz0 = _PyUnicode_DecodeCurrentLocale(tzname[0], "surrogateescape");
+    otz1 = _PyUnicode_DecodeCurrentLocale(tzname[1], "surrogateescape");
     PyModule_AddObject(m, "tzname", Py_BuildValue("(NN)", otz0, otz1));
 #else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/
     {
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -3836,6 +3836,12 @@ _PyUnicode_DecodeCurrentLocaleAndSize(const char *str, Py_ssize_t len,
     return unicode_decode_locale(str, len, errors, 1);
 }
 
+PyObject*
+_PyUnicode_DecodeCurrentLocale(const char *str, const char *errors)
+{
+    return unicode_decode_locale(str, (Py_ssize_t)strlen(str), errors, 1);
+}
+
 PyObject*
 PyUnicode_DecodeLocale(const char *str, const char *errors)
 {

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,7 @@ encode(PyObject *b)`
`138`	`138`	`static PyObject *`
`139`	`139`	`decode(const char *s)`
`140`	`140`	`{`
`141`		`- return _PyUnicode_DecodeCurrentLocaleAndSize(s, strlen(s),`
`142`		`- "surrogateescape");`
	`141`	`+ return _PyUnicode_DecodeCurrentLocale(s, "surrogateescape");`
`143`	`142`	`}`
`144`	`143`
`145`	`144`
Original file line number	Diff line number	Diff line change
`@@ -3836,6 +3836,12 @@ _PyUnicode_DecodeCurrentLocaleAndSize(const char *str, Py_ssize_t len,`
`3836`	`3836`	`return unicode_decode_locale(str, len, errors, 1);`
`3837`	`3837`	`}`
`3838`	`3838`
	`3839`	`+PyObject*`
	`3840`	`+_PyUnicode_DecodeCurrentLocale(const char str, const char errors)`
	`3841`	`+{`
	`3842`	`+ return unicode_decode_locale(str, (Py_ssize_t)strlen(str), errors, 1);`
	`3843`	`+}`
	`3844`	`+`
`3839`	`3845`	`PyObject*`
`3840`	`3846`	`PyUnicode_DecodeLocale(const char str, const char errors)`
`3841`	`3847`	`{`