Home Original page

bpo-29240: Ignore UTF-8 Mode in time module (#5148) · python/cpython@cb3ae55

@@ -418,11 +418,11 @@ tmtotuple(struct tm *p

418418

SET(8, p->tm_isdst);

419419

#ifdef HAVE_STRUCT_TM_TM_ZONE

420420

PyStructSequence_SET_ITEM(v, 9,

421-

PyUnicode_DecodeLocale(p->tm_zone, "surrogateescape"));

421+

_PyUnicode_DecodeCurrentLocale(p->tm_zone, "surrogateescape"));

422422

SET(10, p->tm_gmtoff);

423423

#else

424424

PyStructSequence_SET_ITEM(v, 9,

425-

PyUnicode_DecodeLocale(zone, "surrogateescape"));

425+

_PyUnicode_DecodeCurrentLocale(zone, "surrogateescape"));

426426

PyStructSequence_SET_ITEM(v, 10, _PyLong_FromTime_t(gmtoff));

427427

#endif /* HAVE_STRUCT_TM_TM_ZONE */

428428

#undef SET

@@ -809,8 +809,8 @@ time_strftime(PyObject *self, PyObject *args)

809809

#ifdef HAVE_WCSFTIME

810810

ret = PyUnicode_FromWideChar(outbuf, buflen);

811811

#else

812-

ret = PyUnicode_DecodeLocaleAndSize(outbuf, buflen,

813-

"surrogateescape");

812+

ret = _PyUnicode_DecodeCurrentLocaleAndSize(outbuf, buflen,

813+

"surrogateescape");

814814

#endif

815815

PyMem_Free(outbuf);

816816

break;

@@ -1541,8 +1541,8 @@ PyInit_timezone(PyObject *m) {

15411541

PyModule_AddIntConstant(m, "altzone", timezone-3600);

15421542

#endif

15431543

PyModule_AddIntConstant(m, "daylight", daylight);

1544-

otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape");

1545-

otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape");

1544+

otz0 = _PyUnicode_DecodeCurrentLocale(tzname[0], "surrogateescape");

1545+

otz1 = _PyUnicode_DecodeCurrentLocale(tzname[1], "surrogateescape");

15461546

PyModule_AddObject(m, "tzname", Py_BuildValue("(NN)", otz0, otz1));

15471547

#else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/

15481548

{