extract read_config_files util for config parsing

vm/kojikamid.py

@@ -28,7 +28,7 @@
 
 from __future__ import absolute_import
 from optparse import OptionParser
-from six.moves.configparser import ConfigParser
+from six.moves.configparser import ConfigParser, SafeConfigParser
 import os
 import subprocess
 import sys
@@ -212,7 +212,10 @@ class WindowsBuild(object):
         elif len(specfiles) > 1:
             raise BuildError('Multiple .ini files found')
 
-        conf = ConfigParser()
+        if six.PY2:
+            conf = SafeConfigParser()
+        else:
+            conf = ConfigParser()
         conf.read(os.path.join(self.spec_dir, specfiles[0]))
 
         # [naming] section

vm/kojivmd

@@ -46,7 +46,6 @@ import base64
 import pwd
 import requests
 import fnmatch
-from six.moves.configparser import ConfigParser
 from contextlib import closing
 from optparse import OptionParser
 try:
@@ -102,8 +101,7 @@ def get_options():
         assert False  # pragma: no cover
 
     # load local config
-    config = ConfigParser()
-    config.read(options.configFile)
+    config = koji.read_config_files(options.configFile)
     for x in config.sections():
         if x != 'kojivmd':
             quit('invalid section found in config file: %s' % x)