Skip to content

Commit e062187

Browse files
gh-124969: Fix locale.nl_langinfo(locale.ALT_DIGITS)
Now it returns a tuple of up to 100 strings (an empty tuple on most locales). Previously it returned the first item of that tuple or an empty string.
1 parent 93b9e6b commit e062187

File tree

4 files changed

+69
-6
lines changed

4 files changed

+69
-6
lines changed

Doc/library/locale.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ The :mod:`locale` module defines the following exception and functions:
158158

159159
.. function:: nl_langinfo(option)
160160

161-
Return some locale-specific information as a string. This function is not
161+
Return some locale-specific information as a string (or a tuple for
162+
``ALT_DIGITS``). This function is not
162163
available on all systems, and the set of possible options might also vary
163164
across platforms. The possible argument values are numbers, for which
164165
symbolic constants are available in the locale module.
@@ -311,8 +312,7 @@ The :mod:`locale` module defines the following exception and functions:
311312

312313
.. data:: ALT_DIGITS
313314

314-
Get a representation of up to 100 values used to represent the values
315-
0 to 99.
315+
Get a tuple of up to 100 strings used to represent the values 0 to 99.
316316

317317
The function temporarily sets the ``LC_CTYPE`` locale to the locale
318318
of the category that determines the requested value (``LC_TIME``,

Lib/test/test__locale.py

+36-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from _locale import (setlocale, LC_ALL, LC_CTYPE, LC_NUMERIC, localeconv, Error)
1+
from _locale import (setlocale, LC_ALL, LC_CTYPE, LC_NUMERIC, LC_TIME, localeconv, Error)
22
try:
33
from _locale import (RADIXCHAR, THOUSEP, nl_langinfo)
44
except ImportError:
@@ -74,6 +74,17 @@ def accept(loc):
7474
'ps_AF': ('\u066b', '\u066c'),
7575
}
7676

77+
known_alt_digits = {
78+
'C': (0, {}),
79+
'en_US': (0, {}),
80+
'fa_IR': (100, {0: '\u06f0\u06f0', 10: '\u06f1\u06f0', 99: '\u06f9\u06f9'}),
81+
'ja_JP': (100, {0: '\u3007', 10: '\u5341', 99: '\u4e5d\u5341\u4e5d'}),
82+
'lzh_TW': (32, {0: '\u3007', 10: '\u5341', 31: '\u5345\u4e00'}),
83+
'my_MM': (100, {0: '\u1040\u1040', 10: '\u1041\u1040', 99: '\u1049\u1049'}),
84+
'or_IN': (100, {0: '\u0b66', 10: '\u0b67\u0b66', 99: '\u0b6f\u0b6f'}),
85+
'shn_MM': (100, {0: '\u1090\u1090', 10: '\u1091\u1090', 99: '\u1099\u1099'}),
86+
}
87+
7788
if sys.platform == 'win32':
7889
# ps_AF doesn't work on Windows: see bpo-38324 (msg361830)
7990
del known_numerics['ps_AF']
@@ -179,6 +190,30 @@ def test_lc_numeric_basic(self):
179190
if not tested:
180191
self.skipTest('no suitable locales')
181192

193+
@unittest.skipUnless(nl_langinfo, "nl_langinfo is not available")
194+
@unittest.skipUnless(hasattr(locale, 'ALT_DIGITS'), "requires locale.ALT_DIGITS")
195+
@unittest.skipIf(
196+
support.is_emscripten or support.is_wasi,
197+
"musl libc issue on Emscripten, bpo-46390"
198+
)
199+
def test_alt_digits_nl_langinfo(self):
200+
# Test nl_langinfo(ALT_DIGITS)
201+
tested = False
202+
for loc, (count, samples) in known_alt_digits.items():
203+
try:
204+
setlocale(LC_TIME, loc)
205+
except Error:
206+
continue
207+
with self.subTest(locale=loc):
208+
alt_digits = nl_langinfo(locale.ALT_DIGITS)
209+
self.assertIsInstance(alt_digits, tuple)
210+
self.assertEqual(len(alt_digits), count)
211+
for i in samples:
212+
self.assertEqual(alt_digits[i], samples[i])
213+
tested = True
214+
if not tested:
215+
self.skipTest('no suitable locales')
216+
182217
def test_float_parsing(self):
183218
# Bug #1391872: Test whether float parsing is okay on European
184219
# locales.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix ``locale.nl_langinfo(locale.ALT_DIGITS)``. Now it returns a tuple of up
2+
to 100 strings (an empty tuple on most locales). Previously it returned the
3+
first item of that tuple or an empty string.

Modules/_localemodule.c

+27-2
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,34 @@ _locale_nl_langinfo_impl(PyObject *module, int item)
666666
{
667667
return NULL;
668668
}
669-
PyObject *unicode = PyUnicode_DecodeLocale(result, NULL);
669+
PyObject *pyresult;
670+
#ifdef ALT_DIGITS
671+
if (item == ALT_DIGITS) {
672+
/* The result is a sequence of up to 100 NUL-separated strings. */
673+
const char *s = result;
674+
int count = 0;
675+
for (; count < 100 && *s; count++) {
676+
s += strlen(s) + 1;
677+
}
678+
pyresult = PyTuple_New(count);
679+
if (pyresult != NULL) {
680+
for (int i = 0; i < count; i++) {
681+
PyObject *unicode = PyUnicode_DecodeLocale(result, NULL);
682+
if (unicode == NULL) {
683+
Py_CLEAR(pyresult);
684+
break;
685+
}
686+
PyTuple_SET_ITEM(pyresult, i, unicode);
687+
result += strlen(result) + 1;
688+
}
689+
}
690+
}
691+
#endif
692+
else {
693+
pyresult = PyUnicode_DecodeLocale(result, NULL);
694+
}
670695
restore_locale(oldloc);
671-
return unicode;
696+
return pyresult;
672697
}
673698
}
674699
PyErr_SetString(PyExc_ValueError, "unsupported langinfo constant");

0 commit comments

Comments
 (0)