config: Use path.expand_path and $XDG_CONFIG_DIR instead of hardcoded .config

This commit is contained in:
Thomas Adamcik 2013-04-02 22:56:01 +02:00
parent 3c14d09c87
commit 9310c08f4d

View File

@ -244,7 +244,7 @@ def load_config(options, extensions):
files = [
'/etc/mopidy/mopidy.conf',
'~/.config/mopidy/mopidy.conf',
'$XDG_CONFIG_DIR/mopidy/mopidy.conf',
]
# TODO Add config file given through `options` to `files`
# TODO Replace `files` with single file given through `options`
@ -262,7 +262,7 @@ def load_config(options, extensions):
# Load config from a series of config files
for filename in files:
filename = os.path.expanduser(filename)
filename = path.expand_path(filename)
try:
filehandle = codecs.open(filename, encoding='utf-8')
parser.readfp(filehandle)