Repository navigation
gh-69998: Fix decoding error in locale.nl_langinfo() - #124963
serhiy-storchaka merged 4 commits into
Conversation
Sorry, something went wrong.
The function now sets temporarily the LC_CTYPE locale to the locale of the category that determines the requested value if the locales are different and the resulting string is non-ASCII. This temporary change affects other threads.
vstinner
left a comment
There was a problem hiding this comment.
LGTM. I wrote a similar change in the past using _Py_GetLocaleconvNumeric(). It's used for example in Python/formatter_unicode.c to get the decimal point and thousands separator.
Sorry, something went wrong.
|
Yes, I used your #4174 as an example. |
Sorry, something went wrong.
| && change_locale(langinfo_constants[i].category, &oldloc) < 0) | ||
| { | ||
| return NULL; | ||
| } |
There was a problem hiding this comment.
You don't call nl_langinfo() twice anymore? Why changing the code?
Sorry, something went wrong.
There was a problem hiding this comment.
Because I now think that it was not needed. The result can only be changed if setlocale() is called with the same category or LC_ALL. And, even if it is not explicitly stated, I think that calls setlocale(..., NULL) are not counted.
On other hand,I want to avoid duplication of the code for conversion of the result because of #124974.
Sorry, something went wrong.
There was a problem hiding this comment.
locale.localeconv() calls localeconv() only once, whereas it changes the LC_CTYPE locale while reading its output. Let's do the same for nl_langinfo(). If the assumption is wrong, we can adjust the code later.
Sorry, something went wrong.
vstinner
left a comment
There was a problem hiding this comment.
LGTM with a single call to nl_langinfo().
Sorry, something went wrong.
…124963) The function now sets temporarily the LC_CTYPE locale to the locale of the category that determines the requested value if the locales are different and the resulting string is non-ASCII. This temporary change affects other threads.
The function now sets temporarily the LC_CTYPE locale to the locale of the category that determines the requested value if the locales are different and the resulting string is non-ASCII.
This temporary change affects other threads.
📚 Documentation preview 📚: https://cpython-previews--124963.org.readthedocs.build/