Skip to content

Commit 3d23e70

Browse files
committedSep 16, 2019
refs dictation-toolbox#385: fix stuff broken by settings mocking
1 parent f146147 commit 3d23e70

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed
 

‎_caster.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
main Caster module
44
Created on Jun 29, 2014
55
'''
6-
import datetime
7-
8-
from castervoice.lib.ctrl.mgr.loading.load.content_loader import ContentLoader
9-
from castervoice.lib.ctrl.mgr.loading.load.content_request_generator import ContentRequestGenerator
106

117
import logging
128
logging.basicConfig()
139
from dragonfly import get_engine
10+
11+
from castervoice.lib import settings # requires toml
12+
settings.initialize()
13+
1414
from castervoice.lib.ctrl.dependencies import DependencyMan # requires nothing
1515
DependencyMan().initialize()
1616
_NEXUS = None
17-
from castervoice.lib import settings # requires toml
18-
settings.initialize()
17+
1918
if settings.SYSTEM_INFORMATION["platform"] not in ["win32", "win-amd64"] :
2019
msg = "Your platform ({}) is not currently supported by Caster."
2120
raise SystemError(msg.format(settings.SYSTEM_INFORMATION["platform"]))
@@ -27,6 +26,8 @@
2726
from castervoice.lib import control
2827

2928
if control.nexus() is None:
29+
from castervoice.lib.ctrl.mgr.loading.load.content_loader import ContentLoader
30+
from castervoice.lib.ctrl.mgr.loading.load.content_request_generator import ContentRequestGenerator
3031
_crg = ContentRequestGenerator()
3132
_content_loader = ContentLoader(_crg)
3233
control.init_nexus(_content_loader)

‎castervoice/lib/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def settings(*key_path):
464464
value = SETTINGS
465465
for k in key_path:
466466
if k in value:
467-
value = value[key_path]
467+
value = value[k]
468468
else:
469469
return False
470470
return value

0 commit comments

Comments
 (0)