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

Merge pull request #1196 from forslund/bugfix/missing-config-import 

Configuration system corrections
pull/1206/head
Michael Nguyen 2017-11-07 16:32:47 -06:00 committed by GitHub
parent 15ea88a8ea 9ce3c32688
commit 864128c9c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mycroft/configuration/config.py
View File

@ -1,3 +1,4 @@
# Copyright 2017 Mycroft AI Inc. # Copyright 2017 Mycroft AI Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@ -12,9 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
import inflection
import re import re
import json import json
import inflection
from os.path import exists, isfile, join, dirname, expanduser from os.path import exists, isfile, join, dirname, expanduser
from requests import HTTPError from requests import HTTPError
@ -201,6 +203,11 @@ class Configuration(object):
configs = [LocalConf(DEFAULT_CONFIG), RemoteConf(), configs = [LocalConf(DEFAULT_CONFIG), RemoteConf(),
LocalConf(SYSTEM_CONFIG), LocalConf(USER_CONFIG), LocalConf(SYSTEM_CONFIG), LocalConf(USER_CONFIG),
Configuration.__patch] Configuration.__patch]
else:
# Handle strings in stack
for index, item in enumerate(configs):
if isinstance(item, basestring):
configs[index] = LocalConf(item)
# Merge all configs into one # Merge all configs into one
base = {} base = {}
@ -246,4 +253,4 @@ class Configuration(object):
""" """
config = message.data.get("config", {}) config = message.data.get("config", {})
merge_dict(Configuration.__patch, config) merge_dict(Configuration.__patch, config)
Connection.load_config_stack(cache=True) Configuration.load_config_stack(cache=True)