Issue 2711 - Refactored ChainedConfigParser, allowing manipulation of list items

chainedconfigparser.py

 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
+import io
 import ConfigParser
 from StringIO import StringIO
 
 class Item(tuple):
   def __new__(cls, name, value, source):
     result = super(Item, cls).__new__(cls, (name, value))
     result.source = source
     return result
 
 class DiffForUnknownOptionError(ConfigParser.Error):
@@ skipping 18 matching lines @@
     whitespace-separated lists given by an inherited option:
 
     [section]
     opt1 += foo
     opt2 -= bar
 
     The value of the inherit option has to be a relative path with forward
     slashes as delimiters. Up to 5 configuration files can be chained this way,
     longer chains are disallowed to deal with circular references.
 
-    A main API difference to SafeConfigParser is the way a class instance is
-    constructed: a file path has to be passed, this file is assumed to be
-    encoded as UTF-8. Also, ChainedConfigParser data is read-only and the
-    options are case-sensitive. An additional option_source(section, option)
-    method is provided to get the path of the configuration file defining this
-    option (for relative paths). Items returned by the items() function also
-    have a source attribute serving the same purpose.
+    As opposed to SafeConfigParser, files are decoded as UTF-8 while
+    reading. Also, ChainedConfigParser data is read-only. An additional
+    option_source(section, option) method is provided to get the path
+    of the configuration file defining this option (for relative paths).
+    Items returned by the items() function also have a source attribute
+    serving the same purpose.
   '''
 
   def __init__(self):
     ConfigParser.SafeConfigParser.__init__(self)
     self._origin = {}
+
+  def _make_parser(self, filename):
+    parser = ConfigParser.SafeConfigParser()
+    parser.optionxform = lambda option: option
+
+    with io.open(filename, encoding='utf-8') as file:
+      parser.readfp(file, filename)
+
+    return parser
 
   def _get_parser_chain(self, parser, filename):
     parsers = []
 
     while True:
       parsers.insert(0, (parser, filename))
 
       try:
         inherit = parser.get('default', 'inherit')
       except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
         return parsers
 
       filename = os.path.join(os.path.dirname(filename), *inherit.split('/'))
-      parser = ConfigParser.SafeConfigParser()
-      parser.read(filename)
+      parser = self._make_parser(filename)
 
   def _apply_diff(self, section, option, value):
     is_addition = option.endswith('+')
     is_diff = is_addition or option.endswith('-')
 
     if is_diff:
       option = option[:-1].rstrip()
       try:
         orig_value = self.get(section, option)
       except ConfigParser.NoOptionError:
@@ skipping 21 matching lines @@
             # add_section() hardcodes 'default' and raises a ValueError if
             # you try to add a section called like that (case insensitive).
             # This bug has been fixed in Python 3.
             ConfigParser.SafeConfigParser.readfp(self, StringIO('[%s]' % section))
 
         for option, value in parser.items(section):
           is_diff, option, value = self._apply_diff(section, option, value)
           ConfigParser.SafeConfigParser.set(self, section, option, value)
 
           if not is_diff:
-            self._origin[(section, option)] = filename
+            self._origin[(section, self.optionxform(option))] = filename
 
   def read(self, filenames):
     if isinstance(filenames, basestring):
       filenames = [filenames]
 
     read_ok = []
     for filename in filenames:
-      parser = ConfigParser.SafeConfigParser()
-      read_ok.extend(parser.read(filename))
+      try:
+        parser = self._make_parser(filename)
+      except IOError:
+        continue
       self._process_parsers(self._get_parser_chain(parser, filename))
+      read_ok.append(filename)
 
     return read_ok
 
   def items(self, section, *args, **kwargs):
     items = []
     for option, value in ConfigParser.SafeConfigParser.items(self, section, *args, **kwargs):
-      items.append(Item(option, value, self._origin[(section, option)]))
+      items.append(Item(
+        option, value,
+        self._origin[(section, self.optionxform(option))]
+      ))
     return items
 
   def option_source(self, section, option):
+    option = self.optionxform(option)
     try:
       return self._origin[(section, option)]
     except KeyError:
       if not self.has_section(section):
         raise ConfigParser.NoSectionError(section)
       raise ConfigParser.NoOptionError(option, section)
 
   def readfp(self, fp, filename=None):
     raise NotImplementedError
 
   def set(self, section, option, value=None):
     raise NotImplementedError
 
   def add_section(self, section):
     raise NotImplementedError
 
   def remove_option(self, section, option):
     raise NotImplementedError
 
   def remove_section(self, section):
     raise NotImplementedError