andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xdg: Read .dirs file as text for py3 compat

Browse Source 
Py3's configparser isn't able to work with bytes.
This commit is contained in:
Stein Magnus Jodal 2015-10-29 22:44:36 +01:00
parent 587f2ac3d9
commit 97c6b8812d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mopidy/internal/xdg.py
View File

@ -53,15 +53,15 @@ def _get_user_dirs(xdg_config_dir):
return {}
with open(dirs_file, 'rb') as fh:
data = fh.read()
data = fh.read().decode('utf-8')
data = b'[XDG_USER_DIRS]\n' + data
data = data.replace(b'$HOME', os.path.expanduser(b'~'))
data = data.replace(b'"', b'')
data = '[XDG_USER_DIRS]\n' + data
data = data.replace('$HOME', os.path.expanduser('~'))
data = data.replace('"', '')
config = configparser.RawConfigParser()
config.readfp(io.BytesIO(data))
config.readfp(io.StringIO(data))
return {
k.decode('utf-8').upper(): os.path.abspath(v)
k.upper(): os.path.abspath(v)
for k, v in config.items('XDG_USER_DIRS') if v is not None}