Resume using a fully-constructed config namespace

This commit is contained in:
Peter Eckersley
2016-02-09 10:06:59 -08:00
parent 0af5b4b0a9
commit 3603f482e5
2 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -744,8 +744,8 @@ def _set_by_cli(var):
plugins = plugins_disco.PluginsRegistry.find_all()
# reconstructed_args == sys.argv[1:], or whatever was passed to main()
reconstructed_args = _parser.args + [_parser.verb]
_set_by_cli.detector = prepare_and_parse_args(plugins, reconstructed_args,
detect_defaults=True)
default_args = prepare_and_parse_args(plugins, reconstructed_args, detect_defaults=True)
_set_by_cli.detector = configuration.NamespaceConfig(default_args, fake=True)
try:
# Is detector.var something that isn't false?
+3 -2
View File
@@ -34,7 +34,7 @@ class NamespaceConfig(object):
"""
zope.interface.implements(interfaces.IConfig)
def __init__(self, namespace):
def __init__(self, namespace, fake=False):
self.namespace = namespace
self.namespace.config_dir = os.path.abspath(self.namespace.config_dir)
@@ -42,7 +42,8 @@ class NamespaceConfig(object):
self.namespace.logs_dir = os.path.abspath(self.namespace.logs_dir)
# Check command line parameters sanity, and error out in case of problem.
check_config_sanity(self)
if not fake:
check_config_sanity(self)
def __getattr__(self, name):
return getattr(self.namespace, name)