Commit fe92d0b0 authored by Martin v. Löwis's avatar Martin v. Löwis

Also set LC_CTYPE, to allow localeconv string conversion.

parent 48b98ded
from test.test_support import verbose, TestSkipped, run_unittest from test.test_support import verbose, TestSkipped, run_unittest
from _locale import (setlocale, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo, from _locale import (setlocale, LC_ALL, LC_CTYPE, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo,
localeconv, Error) localeconv, Error)
import unittest import unittest
from platform import uname from platform import uname
...@@ -28,10 +28,10 @@ known_numerics = {'fr_FR' : (',', ''), 'en_US':('.', ',')} ...@@ -28,10 +28,10 @@ known_numerics = {'fr_FR' : (',', ''), 'en_US':('.', ',')}
class _LocaleTests(unittest.TestCase): class _LocaleTests(unittest.TestCase):
def setUp(self): def setUp(self):
self.oldlocale = setlocale(LC_NUMERIC) self.oldlocale = setlocale(LC_ALL)
def tearDown(self): def tearDown(self):
setlocale(LC_NUMERIC, self.oldlocale) setlocale(LC_ALL, self.oldlocale)
# Want to know what value was calculated, what it was compared against, # Want to know what value was calculated, what it was compared against,
# what function was used for the calculation, what type of data was used, # what function was used for the calculation, what type of data was used,
...@@ -58,6 +58,7 @@ class _LocaleTests(unittest.TestCase): ...@@ -58,6 +58,7 @@ class _LocaleTests(unittest.TestCase):
for loc in candidate_locales: for loc in candidate_locales:
try: try:
setlocale(LC_NUMERIC, loc) setlocale(LC_NUMERIC, loc)
setlocale(LC_CTYPE, loc)
except Error: except Error:
continue continue
for li, lc in ((RADIXCHAR, "decimal_point"), for li, lc in ((RADIXCHAR, "decimal_point"),
...@@ -69,6 +70,7 @@ class _LocaleTests(unittest.TestCase): ...@@ -69,6 +70,7 @@ class _LocaleTests(unittest.TestCase):
for loc in candidate_locales: for loc in candidate_locales:
try: try:
setlocale(LC_NUMERIC, loc) setlocale(LC_NUMERIC, loc)
setlocale(LC_CTYPE, loc)
except Error: except Error:
continue continue
for li, lc in ((RADIXCHAR, "decimal_point"), for li, lc in ((RADIXCHAR, "decimal_point"),
...@@ -80,6 +82,7 @@ class _LocaleTests(unittest.TestCase): ...@@ -80,6 +82,7 @@ class _LocaleTests(unittest.TestCase):
for loc in candidate_locales: for loc in candidate_locales:
try: try:
setlocale(LC_NUMERIC, loc) setlocale(LC_NUMERIC, loc)
setlocale(LC_CTYPE, loc)
except Error: except Error:
continue continue
for li, lc in ((RADIXCHAR, "decimal_point"), for li, lc in ((RADIXCHAR, "decimal_point"),
...@@ -102,6 +105,7 @@ class _LocaleTests(unittest.TestCase): ...@@ -102,6 +105,7 @@ class _LocaleTests(unittest.TestCase):
for loc in candidate_locales: for loc in candidate_locales:
try: try:
setlocale(LC_NUMERIC, loc) setlocale(LC_NUMERIC, loc)
setlocale(LC_CTYPE, loc)
except Error: except Error:
continue continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment