From 6b834e6a3353b62079fa1f2bb32425b9479d12ae Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 18 Aug 2010 00:06:45 +0200 Subject: [PATCH] Fix loading of local settings when local settings is not present --- mopidy/utils/settings.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index 34457f05..18f59df7 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -21,9 +21,10 @@ class SettingsProxy(object): def _get_local_settings(self): dotdir = os.path.expanduser(u'~/.mopidy/') settings_file = os.path.join(dotdir, u'settings.py') - if os.path.isfile(settings_file): - sys.path.insert(0, dotdir) - import settings as local_settings_module + if not os.path.isfile(settings_file): + return {} + sys.path.insert(0, dotdir) + import settings as local_settings_module return self._get_settings_dict_from_module(local_settings_module) def _get_settings_dict_from_module(self, module):