From 3bca0d4b28694b7e8d69737aadc5d4b22bd485e8 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Fri, 5 Jun 2009 10:15:55 +0000 Subject: [PATCH] Minor improvement so that user's options can also be passed directly as a dictionary/advancedDict rather than only as an optparse instance. --- lib/core/option.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/core/option.py b/lib/core/option.py index fdfc13d8d..501219473 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -949,7 +949,12 @@ def __mergeOptions(inputOptions): if inputOptions.configFile: configFileParser(inputOptions.configFile) - for key, value in inputOptions.__dict__.items(): + if hasattr(inputOptions, "items"): + inputOptionsItems = inputOptions.items() + else: + inputOptionsItems = inputOptions.__dict__.items() + + for key, value in inputOptionsItems: if not conf.has_key(key) or conf[key] == None or value != None: conf[key] = value