From dd5336539dd74721fe1b636ea24c4eb0f58774ab Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 14 Jan 2012 22:20:41 +0100 Subject: [PATCH] Make sure the calls returns strings even when the object we call on is an mock --- mopidy/__init__.py | 6 +++--- mopidy/backends/local/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mopidy/__init__.py b/mopidy/__init__.py index ced47e07..b94378b2 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -10,9 +10,9 @@ from subprocess import PIPE, Popen VERSION = (0, 7, 0) -DATA_PATH = os.path.join(glib.get_user_data_dir(), 'mopidy') -CACHE_PATH = os.path.join(glib.get_user_cache_dir(), 'mopidy') -SETTINGS_PATH = os.path.join(glib.get_user_config_dir(), 'mopidy') +DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy') +CACHE_PATH = os.path.join(str(glib.get_user_cache_dir()), 'mopidy') +SETTINGS_PATH = os.path.join(str(glib.get_user_config_dir()), 'mopidy') SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py') def get_version(): diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index e1d11bcb..e8638a3a 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -21,7 +21,7 @@ logger = logging.getLogger(u'mopidy.backends.local') DEFAULT_PLAYLIST_PATH = os.path.join(DATA_PATH, 'playlists') DEFAULT_TAG_CACHE_FILE = os.path.join(DATA_PATH, 'tag_cache') -DEFAULT_MUSIC_PATH = glib.get_user_special_dir(glib.USER_DIRECTORY_MUSIC) +DEFAULT_MUSIC_PATH = str(glib.get_user_special_dir(glib.USER_DIRECTORY_MUSIC)) if not DEFAULT_MUSIC_PATH or DEFAULT_MUSIC_PATH == os.path.expanduser(u'~'): DEFAULT_MUSIC_PATH = os.path.expanduser(u'~/music')