# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1332964610 25200
# Node ID c119eb07a37883c6a7209feb628f06719057fadb
# Parent  0516a9e0566b574ab06c9da2beac1f194c2eb413
rename/shuffle options to make more sense

diff -r 0516a9e0566b -r c119eb07a378 configuration/configuration.py
--- a/configuration/configuration.py	Wed Mar 28 12:42:58 2012 -0700
+++ b/configuration/configuration.py	Wed Mar 28 12:56:50 2012 -0700
@@ -193,7 +193,7 @@
 
     options = {} # configuration basis
 
-    def __init__(self, configuration_providers=configuration_providers, configuration_provider_option=None, types=types, dump='--dump', **parser_args):
+    def __init__(self, configuration_providers=configuration_providers, types=types, load=None, dump='--dump', **parser_args):
 
         # setup configuration
         self.config = {}
@@ -217,10 +217,10 @@
         self.parsed = set()
         self.optparse_options(self)
         # add option(s) for configuration_providers
-        if configuration_provider_option:
-            self.add_option(configuration_provider_option,
-                              dest='load', action='append',
-                              help="load configuration from a file")
+        if load:
+            self.add_option(load,
+                            dest='load', action='append',
+                            help="load configuration from a file")
 
         # add an option for dumping
         formats = self.formats()