Files
MINGW-packages/mingw-w64-python/3010-workaround-missing-lconv-members-mingw.patch
2020-12-26 08:40:13 +01:00

32 lines
1.3 KiB
Diff

--- Python-3.8.7/Modules/_localemodule.c.orig 2020-12-26 06:59:08.920163200 +0100
+++ Python-3.8.7/Modules/_localemodule.c 2020-12-26 07:01:52.023610900 +0100
@@ -177,7 +177,7 @@
#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#else /* MS_WINDOWS */
/* Use _W_* fields of Windows struct lconv */
-#define GET_LOCALE_STRING(ATTR) PyUnicode_FromWideChar(lc->_W_ ## ATTR, -1)
+#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#endif /* MS_WINDOWS */
int res = -1;
@@ -249,7 +249,7 @@
#ifdef MS_WINDOWS
/* Use _W_* fields of Windows struct lconv */
-#define GET_LOCALE_STRING(ATTR) PyUnicode_FromWideChar(lc->_W_ ## ATTR, -1)
+#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#else
#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#endif
--- Python-3.8.7/Python/fileutils.c.orig 2020-12-21 17:25:24.000000000 +0100
+++ Python-3.8.7/Python/fileutils.c 2020-12-26 06:52:52.517357800 +0100
@@ -1975,7 +1975,7 @@
#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#else /* MS_WINDOWS */
/* Use _W_* fields of Windows strcut lconv */
-#define GET_LOCALE_STRING(ATTR) PyUnicode_FromWideChar(lc->_W_ ## ATTR, -1)
+#define GET_LOCALE_STRING(ATTR) PyUnicode_DecodeLocale(lc->ATTR, NULL)
#endif /* MS_WINDOWS */
int res = -1;