MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pep8

pull/652/head
JarbasAI 2017-04-11 16:24:14 +01:00 committed by GitHub
parent faf2e9f3b3
commit 805aefc0d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mycroft/configuration/__init__.py
View File

@ -34,6 +34,7 @@ REMOTE_CONFIG = "mycroft.ai"
load_order = [DEFAULT_CONFIG, REMOTE_CONFIG, SYSTEM_CONFIG, USER_CONFIG] load_order = [DEFAULT_CONFIG, REMOTE_CONFIG, SYSTEM_CONFIG, USER_CONFIG]
class ConfigurationLoader(object): class ConfigurationLoader(object):
""" """
A utility for loading Mycroft configuration files. A utility for loading Mycroft configuration files.
@ -165,7 +166,8 @@ class ConfigurationManager(object):
if location == REMOTE_CONFIG: if location == REMOTE_CONFIG:
RemoteConfiguration.load(ConfigurationManager.__config) RemoteConfiguration.load(ConfigurationManager.__config)
else: else:
ConfigurationManager.__config = ConfigurationLoader.load(ConfigurationManager.__config, [location]) ConfigurationManager.__config = ConfigurationLoader.load(
ConfigurationManager.__config, [location])
return ConfigurationManager.__config return ConfigurationManager.__config
@staticmethod @staticmethod