tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-27 07:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix LC_MESSAGES AttributeError

Browse Source 
Adds code to check if locale has the 'LC_MESSAGES' attribute before
    executing the following line of code:

        locale.getlocale(locale.LC_MESSAGES)[1]

    Fixes #1555
This commit is contained in:
FocusedWolf 2016-03-24 04:52:45 -04:00
parent d7e913280c
commit 2f1893a968
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
powerline/lib/encoding.py
View File

@ -43,9 +43,15 @@ def get_preferred_output_encoding():
Falls back to ASCII, so that output is most likely to be displayed Falls back to ASCII, so that output is most likely to be displayed
correctly. correctly.
''' '''
if hasattr(locale, 'LC_MESSAGES'):
return (
locale.getlocale(locale.LC_MESSAGES)[1]
or locale.getdefaultlocale()[1]
or 'ascii'
)
return ( return (
locale.getlocale(locale.LC_MESSAGES)[1] locale.getdefaultlocale()[1]
or locale.getdefaultlocale()[1]
or 'ascii' or 'ascii'
) )
@ -57,9 +63,15 @@ def get_preferred_input_encoding():
Falls back to latin1 so that function is less likely to throw as decoded Falls back to latin1 so that function is less likely to throw as decoded
output is primary searched for ASCII values. output is primary searched for ASCII values.
''' '''
if hasattr(locale, 'LC_MESSAGES'):
return (
locale.getlocale(locale.LC_MESSAGES)[1]
or locale.getdefaultlocale()[1]
or 'latin1'
)
return ( return (
locale.getlocale(locale.LC_MESSAGES)[1] locale.getdefaultlocale()[1]
or locale.getdefaultlocale()[1]
or 'latin1' or 'latin1'
) )