diff options
| -rw-r--r-- | Lib/locale.py | 18 | ||||
| -rw-r--r-- | Lib/test/test_locale.py | 8 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 23 insertions, 7 deletions
diff --git a/Lib/locale.py b/Lib/locale.py index 3dc4cafcb1..58cf0a75b3 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -440,13 +440,17 @@ def _build_localename(localetuple): No aliasing or normalizing takes place. """ - language, encoding = localetuple - if language is None: - language = 'C' - if encoding is None: - return language - else: - return language + '.' + encoding + try: + language, encoding = localetuple + + if language is None: + language = 'C' + if encoding is None: + return language + else: + return language + '.' + encoding + except (TypeError, ValueError): + raise TypeError('Locale must be None, a string, or an iterable of two strings -- language code, encoding.') def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')): diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index 19abe596fd..44081b9462 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -409,6 +409,14 @@ class TestMiscellaneous(unittest.TestCase): locale.setlocale(locale.LC_CTYPE, loc) self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) + def test_invalid_locale_format_in_localetuple(self): + with self.assertRaises(TypeError): + locale.setlocale(locale.LC_ALL, b'fi_FI') + + def test_invalid_iterable_in_localetuple(self): + with self.assertRaises(TypeError): + locale.setlocale(locale.LC_ALL, (b'not', b'valid')) + def test_main(): tests = [ @@ -768,6 +768,7 @@ John Popplewell Amrit Prem Paul Prescod Donovan Preston +Jyrki Pulliainen Steve Purcell Fernando Pérez Eduardo Pérez @@ -350,6 +350,9 @@ Core and Builtins Library ------- +- Issue #3067: locale.setlocale() now raises TypeError if the second + argument is an invalid iterable. Initial patch by Jyrki Pulliainen. + - Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. - Issue #13339: Fix compile error in posixmodule.c due to missing semicolon. |