Minor improvement so that user's options can also be passed directly as a dictionary/advancedDict rather than only as an optparse instance.

bdamele · bdamele · commit 3bca0d4b2869 · 2009-06-05T10:15:55.000Z
diff --git 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
 
