1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix r85728: use "" to mean the system default locale, which should work on more systems.

Browse Source
This commit is contained in:
Georg Brandl 2010-10-20 06:50:19 +00:00
parent f19076e592
commit 9450cc056a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/test_calendar.py
View File

@ -254,16 +254,13 @@ class CalendarTestCase(unittest.TestCase):
def test_localecalendars(self): def test_localecalendars(self):
# ensure that Locale{Text,HTML}Calendar resets the locale properly # ensure that Locale{Text,HTML}Calendar resets the locale properly
# (it is still not thread-safe though) # (it is still not thread-safe though)
try:
def_locale = locale.getdefaultlocale()
except locale.Error:
# cannot determine a default locale -- skip test
return
old_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) old_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
calendar.LocaleTextCalendar( try:
locale=def_locale).formatmonthname(2010, 10, 10) calendar.LocaleTextCalendar(locale='').formatmonthname(2010, 10, 10)
calendar.LocaleHTMLCalendar( except locale.Error:
locale=def_locale).formatmonthname(2010, 10) # cannot set the system default locale -- skip rest of test
return
calendar.LocaleHTMLCalendar(locale='').formatmonthname(2010, 10)
new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
self.assertEquals(old_october, new_october) self.assertEquals(old_october, new_october)