Allows for calling getConfiguration without parametter for geting the

default configuration
This commit is contained in:
2016-04-11 13:31:09 +02:00
parent 45c9c5075c
commit 6fe4c6134a
2 changed files with 12 additions and 5 deletions

View File

@ -6,5 +6,5 @@ cpdef str getRootConfigName()
cdef dict buildDefaultConfiguration(str root_config_name,
dict config)
cpdef dict getConfiguration(str root_config_name,
dict config)
cpdef dict getConfiguration(str root_config_name=?,
dict config=?)

View File

@ -12,7 +12,7 @@ from .command import getCommandsList
from .logging cimport getLogger
from .arguments cimport buildArgumentParser
from obitools3.version import version
from ..version import version
from _curses import version
cdef dict __default_config__ = {}
@ -57,13 +57,20 @@ cdef dict buildDefaultConfiguration(str root_config_name,
return __default_config__
cpdef dict getConfiguration(str root_config_name,
dict config):
cpdef dict getConfiguration(str root_config_name="__default__",
dict config={}):
global __default_config__
if '__done__' in __default_config__:
return __default_config__
if root_config_name=="__default__":
raise RuntimeError("No root_config_name specified")
if not config:
raise RuntimeError("Base configuration is empty")
config = buildDefaultConfiguration(root_config_name,
config)