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

Fix crash when XDG variables contain non-ASCII characters (fixes #256)

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-21 10:19:39 +01:00
parent 33e268c79b
commit 26e6b2e730
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.rst
View File

@ -13,7 +13,9 @@ v0.10.0 (in development)
**Bug fixes**
- None yet
- :issue:`256`: Fix crash caused by non-ASCII characters in paths returned from
``glib``. The bug can be worked around by overriding the settings that
includes offending `$XDG_` variables.
v0.9.0 (2012-11-21)

7
mopidy/utils/path.py
View File

@ -17,9 +17,10 @@ DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy')
SETTINGS_PATH = os.path.join(str(glib.get_user_config_dir()), 'mopidy')
SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py')
XDG_DIRS = {
'XDG_CACHE_DIR': glib.get_user_cache_dir(),
'XDG_DATA_DIR': glib.get_user_data_dir(),
'XDG_MUSIC_DIR': glib.get_user_special_dir(glib.USER_DIRECTORY_MUSIC),
'XDG_CACHE_DIR': glib.get_user_cache_dir().decode('utf-8'),
'XDG_DATA_DIR': glib.get_user_data_dir().decode('utf-8'),
'XDG_MUSIC_DIR': (
glib.get_user_special_dir(glib.USER_DIRECTORY_MUSIC).decode('utf-8')),
}