Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Work around test_locale failing on Solaris. 

Will backport to 2.4.
This commit is contained in:
Martin v. Löwis 2005-12-30 12:51:45 +00:00
parent d5845ec32e
commit 4cfa136680
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_locale.py
View File

@ -38,13 +38,15 @@ def testformat(formatstr, value, grouping = 0, output=None):
print "yes" print "yes"
try: try:
testformat("%f", 1024, grouping=1, output='1,024.000000') # On Solaris 10, the thousands_sep is the empty string
sep = locale.localeconv()['thousands_sep']
testformat("%f", 1024, grouping=1, output='1%s024.000000' % sep)
testformat("%f", 102, grouping=1, output='102.000000') testformat("%f", 102, grouping=1, output='102.000000')
testformat("%f", -42, grouping=1, output='-42.000000') testformat("%f", -42, grouping=1, output='-42.000000')
testformat("%+f", -42, grouping=1, output='-42.000000') testformat("%+f", -42, grouping=1, output='-42.000000')
testformat("%20.f", -42, grouping=1, output=' -42') testformat("%20.f", -42, grouping=1, output=' -42')
testformat("%+10.f", -4200, grouping=1, output=' -4,200') testformat("%+10.f", -4200, grouping=1, output=' -4%s200' % sep)
testformat("%-10.f", 4200, grouping=1, output='4,200 ') testformat("%-10.f", 4200, grouping=1, output='4%s200 ' % sep)
# Invoke getpreferredencoding to make sure it does not cause exceptions, # Invoke getpreferredencoding to make sure it does not cause exceptions,
locale.getpreferredencoding() locale.getpreferredencoding()
finally: finally:
@ -65,6 +67,9 @@ def teststrop(s, method, output):
print "yes" print "yes"
try: try:
if sys.platform == 'sunos5':
# On Solaris, in en_US.UTF-8, \xa0 is a space
raise locale.Error
oldlocale = locale.setlocale(locale.LC_CTYPE) oldlocale = locale.setlocale(locale.LC_CTYPE)
locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8') locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8')
except locale.Error: except locale.Error: