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

Merge pull request #1556 from FocusedWolf/1555-fix-attribute-error-lc_messages

Browse Source 
Fix LC_MESSAGES AttributeError
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2016-03-24 22:55:21 +03:00
commit 6ff06016da
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'
) )