From: Georg Brandl Date: Wed, 20 Oct 2010 06:50:19 +0000 (+0000) Subject: Fix r85728: use "" to mean the system default locale, which should work on more systems. X-Git-Tag: v3.2a4~414 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9450cc056a19d7d12a819fa020f4f1abf805d58c;p=python Fix r85728: use "" to mean the system default locale, which should work on more systems. --- diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index f906bc39bd..9ba7f0c071 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -254,16 +254,13 @@ class CalendarTestCase(unittest.TestCase): def test_localecalendars(self): # ensure that Locale{Text,HTML}Calendar resets the locale properly # (it is still not thread-safe though) + old_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) try: - def_locale = locale.getdefaultlocale() + calendar.LocaleTextCalendar(locale='').formatmonthname(2010, 10, 10) except locale.Error: - # cannot determine a default locale -- skip test + # cannot set the system default locale -- skip rest of test return - old_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) - calendar.LocaleTextCalendar( - locale=def_locale).formatmonthname(2010, 10, 10) - calendar.LocaleHTMLCalendar( - locale=def_locale).formatmonthname(2010, 10) + calendar.LocaleHTMLCalendar(locale='').formatmonthname(2010, 10) new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) self.assertEquals(old_october, new_october)