# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1332948834 25200
# Node ID a8013bd3126a5df44137ac49b0689fd4b58830be
# Parent  e7005b75ef8dc4823c5cee2dbfed5eac3fef4238
minor bug fixes

diff -r e7005b75ef8d -r a8013bd3126a configuration/configuration.py
--- a/configuration/configuration.py	Wed Mar 28 08:29:50 2012 -0700
+++ b/configuration/configuration.py	Wed Mar 28 08:33:54 2012 -0700
@@ -345,14 +345,14 @@
 
         # get CLI configuration options
         cli_config = dict([(key, value) for key, value in options.__dict__.items()
-                           if key in self.options and key in parser.parsed])
+                           if key in self.options and key in self.parsed])
 
         # deserialize configuration
         configuration_files = getattr(options, 'load', args)
         missing = [i for i in configuration_files
                    if not os.path.exists(i)]
         if missing:
-            parser.error("Missing files: %s" % ', '.join(missing))
+            self.error("Missing files: %s" % ', '.join(missing))
         config = []
         for f in configuration_files:
             try:
@@ -378,6 +378,9 @@
             # XXX assuming if you don't have values you were just dumping
             raise missingvalues
 
+        # update options from config
+        options.__dict__.update(self.config)
+
         # return parsed arguments
         return options, args
 
diff -r e7005b75ef8d -r a8013bd3126a tests/example.py
--- a/tests/example.py	Wed Mar 28 08:29:50 2012 -0700
+++ b/tests/example.py	Wed Mar 28 08:33:54 2012 -0700
@@ -21,5 +21,6 @@
         }
 
 if __name__ == '__main__':
-    options, args = ExampleConfiguration().parse()
-
+    from pprint import pprint
+    options, args = ExampleConfiguration().parse_args()
+    pprint(options.__dict__)