| Index: fix_encoding.py
|
| diff --git a/fix_encoding.py b/fix_encoding.py
|
| index 5bfb58e30a6a6bb5fd00985be5f96adb9b2267ce..ab418695b20d50eca5b6f2874ad988d734087a4d 100644
|
| --- a/fix_encoding.py
|
| +++ b/fix_encoding.py
|
| @@ -46,17 +46,23 @@ def fix_default_encoding():
|
| if attr[0:3] != 'LC_':
|
| continue
|
| aref = getattr(locale, attr)
|
| - locale.setlocale(aref, '')
|
| + try:
|
| + locale.setlocale(aref, '')
|
| + except locale.Error:
|
| + continue
|
| try:
|
| lang = locale.getlocale(aref)[0]
|
| except (TypeError, ValueError):
|
| - lang = None
|
| + continue
|
| if lang:
|
| try:
|
| locale.setlocale(aref, (lang, 'UTF-8'))
|
| except locale.Error:
|
| os.environ[attr] = lang + '.UTF-8'
|
| - locale.setlocale(locale.LC_ALL, '')
|
| + try:
|
| + locale.setlocale(locale.LC_ALL, '')
|
| + except locale.Error:
|
| + pass
|
| return True
|
|
|
|
|
|
|