RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303 from jrbenito/UTF8 

UTF-8 file paths error on python 2
This commit is contained in:
Peter Wu 2016-11-18 22:22:11 +01:00 committed by GitHub
parent fb1442dbcb 122d76d061
commit e6c02f5c52
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/solaar
View File

@ -26,7 +26,20 @@ def init_paths():
import sys import sys
import os.path as _path import os.path as _path
prefix = _path.normpath(_path.join(_path.realpath(sys.path[0]), '..')) # Python 2 need conversion from utf-8 filenames
# Python 3 might have problems converting back to UTF-8 in case of Unicode surrogates
try:
if sys.version_info < (3,):
decoded_path = sys.path[0].decode(sys.getfilesystemencoding())
else:
decoded_path = sys.path[0]
sys.path[0].encode(sys.getfilesystemencoding())
except UnicodeError:
sys.stderr.write('ERROR: Solaar cannot recognize encoding of filesystem path, this may happen because non UTF-8 characters in the pathname.\n')
sys.exit(1)
prefix = _path.normpath(_path.join(_path.realpath(decoded_path), '..'))
src_lib = _path.join(prefix, 'lib') src_lib = _path.join(prefix, 'lib')
share_lib = _path.join(prefix, 'share', 'solaar', 'lib') share_lib = _path.join(prefix, 'share', 'solaar', 'lib')
for location in src_lib, share_lib: for location in src_lib, share_lib: