# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1354662088 28800
# Node ID dd3480af4cd5082c844b179afb842d0b689b8780
# Parent  9d19ed8fd883acbe6669a9e7c3942791a129281f
separate into own method

diff -r 9d19ed8fd883 -r dd3480af4cd5 configuration/configuration.py
--- a/configuration/configuration.py	Mon Oct 01 17:08:45 2012 -0700
+++ b/configuration/configuration.py	Tue Dec 04 15:01:28 2012 -0800
@@ -432,16 +432,9 @@
                 continue
             parser.add_option(*args, **kw)
 
-    def parse_args(self, *args, **kw):
-
-        self.parsed = dict()
-        options, args = optparse.OptionParser.parse_args(self, *args, **kw)
+    def read_configuration_files(self, options, args):
+        """deserialize configuration"""
 
-        # get CLI configuration options
-        cli_config = dict([(key, value) for key, value in options.__dict__.items()
-                           if key in self.option_dict and key in self.parsed])
-
-        # deserialize configuration
         configuration_files = getattr(options, self.load_option, args)
         if not configuration_files:
             configuration_files = []
@@ -459,6 +452,19 @@
                     config.append(loaded_config)
             except BaseException, e:
                 parser.error(str(e))
+        return config
+
+    def parse_args(self, *args, **kw):
+
+        self.parsed = dict()
+        options, args = optparse.OptionParser.parse_args(self, *args, **kw)
+
+        # get CLI configuration options
+        cli_config = dict([(key, value) for key, value in options.__dict__.items()
+                           if key in self.option_dict and key in self.parsed])
+
+        # deserialize configuration
+        config = self.read_configuration_files(options, args)
         config.append(cli_config)
 
         missingvalues = None