From: Joe Wreschnig Date: Mon, 15 Feb 2010 05:39:44 +0000 (-0800) Subject: syslocale: setlocale for LC_COLLATE requires encoding to be considered valid. X-Git-Url: https://git.korewanetadesu.com/?p=python-collate.git;a=commitdiff_plain;h=e4b16f225fadb8868f6040c7798f2dd4c4d197e1;hp=e168dd08689113c094141be7e58bacddf5034fa8 syslocale: setlocale for LC_COLLATE requires encoding to be considered valid. --- diff --git a/collate/syslocale.py b/collate/syslocale.py index 4a67044..1ee2924 100644 --- a/collate/syslocale.py +++ b/collate/syslocale.py @@ -35,9 +35,10 @@ class Collator(collate._abcollator.Collator): def __init__(self, locale_code, encoding=None): locale_code, encoding = collate._locale.getpair(locale_code, encoding) try: - locale.setlocale(locale.LC_COLLATE, locale_code) + setlocale = locale_code + "." + encoding + locale.setlocale(locale.LC_COLLATE, setlocale) except locale.Error: - raise collate.errors.InvalidLocaleError(locale_code) + raise collate.errors.InvalidLocaleError(setlocale) self.locale = locale.getlocale(locale.LC_COLLATE)[0] self.encoding = collate._locale.encoding(encoding)