comparison configuration/configuration.py @ 75:c119eb07a378

rename/shuffle options to make more sense
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 28 Mar 2012 12:56:50 -0700
parents c831eb58fb52
children 348451576d84
comparison
equal deleted inserted replaced
74:0516a9e0566b 75:c119eb07a378
191 class Configuration(optparse.OptionParser): 191 class Configuration(optparse.OptionParser):
192 """declarative configuration object""" 192 """declarative configuration object"""
193 193
194 options = {} # configuration basis 194 options = {} # configuration basis
195 195
196 def __init__(self, configuration_providers=configuration_providers, configuration_provider_option=None, types=types, dump='--dump', **parser_args): 196 def __init__(self, configuration_providers=configuration_providers, types=types, load=None, dump='--dump', **parser_args):
197 197
198 # setup configuration 198 # setup configuration
199 self.config = {} 199 self.config = {}
200 self.configuration_providers = configuration_providers 200 self.configuration_providers = configuration_providers
201 self.types = types 201 self.types = types
215 parser_args.setdefault('option_class', ConfigurationOption) 215 parser_args.setdefault('option_class', ConfigurationOption)
216 optparse.OptionParser.__init__(self, **parser_args) 216 optparse.OptionParser.__init__(self, **parser_args)
217 self.parsed = set() 217 self.parsed = set()
218 self.optparse_options(self) 218 self.optparse_options(self)
219 # add option(s) for configuration_providers 219 # add option(s) for configuration_providers
220 if configuration_provider_option: 220 if load:
221 self.add_option(configuration_provider_option, 221 self.add_option(load,
222 dest='load', action='append', 222 dest='load', action='append',
223 help="load configuration from a file") 223 help="load configuration from a file")
224 224
225 # add an option for dumping 225 # add an option for dumping
226 formats = self.formats() 226 formats = self.formats()
227 if formats and dump: 227 if formats and dump:
228 self.add_option(dump, dest='dump', 228 self.add_option(dump, dest='dump',