Move config location definitions to separate file

mycroft/configuration/__init__.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .config import Configuration, LocalConf, RemoteConf, \
-                   SYSTEM_CONFIG, USER_CONFIG
+from .config import Configuration, LocalConf, RemoteConf
+from .locations import SYSTEM_CONFIG, USER_CONFIG
 
 
 # Compatibility

mycroft/configuration/config.py

@@ -17,12 +17,14 @@
 import re
 import json
 import inflection
-from os.path import exists, isfile, join, dirname, expanduser
+from os.path import exists, isfile
 from requests import RequestException
 
 from mycroft.util.json_helper import load_commented_json, merge_dict
 from mycroft.util.log import LOG
 
+from .locations import DEFAULT_CONFIG, SYSTEM_CONFIG, USER_CONFIG
+
 
 def is_remote_list(values):
     ''' check if this list corresponds to a backend formatted collection of
@@ -172,12 +174,6 @@ def __init__(self, cache=None):
             self.load_local(cache)
 
 
-DEFAULT_CONFIG = join(dirname(__file__), 'mycroft.conf')
-SYSTEM_CONFIG = '/etc/mycroft/mycroft.conf'
-USER_CONFIG = join(expanduser('~'), '.mycroft/mycroft.conf')
-REMOTE_CONFIG = "mycroft.ai"
-
-
 class Configuration(object):
     __config = {}  # Cached config
     __patch = {}  # Patch config that skills can update to override config

mycroft/configuration/locations.py

@@ -0,0 +1,19 @@
+# Copyright 2018 Mycroft AI Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from os.path import join, dirname, expanduser
+
+DEFAULT_CONFIG = join(dirname(__file__), 'mycroft.conf')
+SYSTEM_CONFIG = '/etc/mycroft/mycroft.conf'
+USER_CONFIG = join(expanduser('~'), '.mycroft/mycroft.conf')
+REMOTE_CONFIG = "mycroft.ai"

mycroft/util/log.py

@@ -16,13 +16,10 @@
 import logging
 import sys
 
-from os.path import isfile, join, expanduser
+from os.path import isfile
 
 from mycroft.util.json_helper import load_commented_json, merge_dict
-# from mycroft.configuration import SYSTEM_CONFIG, USER_CONFIG
-# TODO avoid circular imports, do not redefine these constants here
-SYSTEM_CONFIG = '/etc/mycroft/mycroft.conf'
-USER_CONFIG = join(expanduser('~'), '.mycroft/mycroft.conf')
+from mycroft.configuration.locations import SYSTEM_CONFIG, USER_CONFIG
 
 
 def getLogger(name="MYCROFT"):