# HG changeset patch # User Jeff Hammel # Date 1354666675 28800 # Node ID 4c7f93ce302a062f3d262a4a28ede0aa7b42c08e # Parent f103c93690fb10c35f76ff6ed36343a8cb4412c9 separate loading configuration files to its own method for consumers diff -r f103c93690fb -r 4c7f93ce302a configuration/configuration.py --- a/configuration/configuration.py Tue Dec 04 15:37:34 2012 -0800 +++ b/configuration/configuration.py Tue Dec 04 16:17:55 2012 -0800 @@ -444,6 +444,10 @@ configuration_files = [configuration_files] return configuration_files + def load_configuration_file(self, filename): + """load a configuration file""" + return self.deserialize(filename) + def read_configuration_files(self, options, args): """deserialize configuration""" @@ -455,7 +459,7 @@ config = [] for f in configuration_files: try: - loaded_config = self.deserialize(f) + loaded_config = self.load_configuration_file(f) if loaded_config: config.append(loaded_config) except BaseException, e: @@ -464,6 +468,7 @@ def parse_args(self, *args, **kw): + # parse command line options self.parsed = dict() options, args = optparse.OptionParser.parse_args(self, *args, **kw)