projects
/
python-collate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syslocale: setlocale for LC_COLLATE requires encoding to be considered valid.
[python-collate.git]
/
collate
/
syslocale.py
diff --git
a/collate/syslocale.py
b/collate/syslocale.py
index
4a67044
..
1ee2924
100644
(file)
--- 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:
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:
except locale.Error:
- raise collate.errors.InvalidLocaleError(
locale_cod
e)
+ raise collate.errors.InvalidLocaleError(
setlocal
e)
self.locale = locale.getlocale(locale.LC_COLLATE)[0]
self.encoding = collate._locale.encoding(encoding)
self.locale = locale.getlocale(locale.LC_COLLATE)[0]
self.encoding = collate._locale.encoding(encoding)