Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-04-22 03:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-28604: Fix localeconv() for different LC_MONETARY (GH-10606) (GH-10619)

Browse source 
locale.localeconv() now sets temporarily the LC_CTYPE locale to the
LC_MONETARY locale if the two locales are different and monetary
strings are non-ASCII. This temporary change affects other threads.

Changes:

* locale.localeconv() can now set LC_CTYPE to LC_MONETARY to decode
  monetary fields.
* Add LocaleInfo.grouping_buffer: copy localeconv() grouping string
  since it can be replaced anytime if a different thread calls
  localeconv().

(cherry picked from commit 02e6bf7f20)
This commit is contained in:
Victor Stinner 2018-11-20 22:06:21 +01:00 • committed by GitHub
parent d57ab8ac18
commit 6eff6b8eec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 107 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/fileutils.c
View file

@ -1801,7 +1801,7 @@ _Py_GetLocaleconvNumeric(PyObject **decimal_point, PyObject **thousands_sep,
if (change_locale) {
oldloc = setlocale(LC_CTYPE, NULL);
if (!oldloc) {
PyErr_SetString(PyExc_RuntimeWarning, "faild to get LC_CTYPE locale");
PyErr_SetString(PyExc_RuntimeWarning, "failed to get LC_CTYPE locale");
return -1;
}
@ -1817,7 +1817,7 @@ _Py_GetLocaleconvNumeric(PyObject **decimal_point, PyObject **thousands_sep,
}
if (loc != NULL) {
/* Only set the locale temporarilty the LC_CTYPE locale
/* Only set the locale temporarily the LC_CTYPE locale
if LC_NUMERIC locale is different than LC_CTYPE locale and
decimal_point and/or thousands_sep are non-ASCII or longer than
1 byte */

17
Python/formatter_unicode.c
View file

@ -396,9 +396,10 @@ typedef struct {
PyObject *decimal_point;
PyObject *thousands_sep;
const char *grouping;
char *grouping_buffer;
} LocaleInfo;
#define STATIC_LOCALE_INFO_INIT {0, 0, 0}
#define STATIC_LOCALE_INFO_INIT {0, 0, 0, 0}
/* describes the layout for an integer, see the comment in
calc_number_widths() for details */
@ -705,11 +706,22 @@ get_locale_info(enum LocaleType type, LocaleInfo *locale_info)
{
switch (type) {
case LT_CURRENT_LOCALE: {
const char *grouping;
if (_Py_GetLocaleconvNumeric(&locale_info->decimal_point,
&locale_info->thousands_sep,
&locale_info->grouping) < 0) {
&grouping) < 0) {
return -1;
}
/* localeconv() grouping can become a dangling pointer or point
to a different string if another thread calls localeconv() during
the string formatting. Copy the string to avoid this risk. */
locale_info->grouping_buffer = _PyMem_Strdup(grouping);
if (locale_info->grouping_buffer == NULL) {
PyErr_NoMemory();
return -1;
}
locale_info->grouping = locale_info->grouping_buffer;
break;
}
case LT_DEFAULT_LOCALE:
@ -743,6 +755,7 @@ free_locale_info(LocaleInfo *locale_info)
{
Py_XDECREF(locale_info->decimal_point);
Py_XDECREF(locale_info->thousands_sep);
PyMem_Free(locale_info->grouping_buffer);
}
/************************************************************************/