1 files changed, 10 insertions, 68 deletions

diff --git a/dodai/config/sections.py b/dodai/config/sections.py
index 2b08587..d789a24 100644
--- a/dodai/config/sections.py
+++ b/dodai/config/sections.py
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Dodai.  If not, see <http://www.gnu.org/licenses/>.
 
-import unicodedata
 
 class ConfigSections(object):
     """
@@ -23,7 +22,8 @@ class ConfigSections(object):
 
     """
 
-    def __init__(self, string_object = None):
+    def __init__(self, ordered_dict_object, section_object,
+                 string_object = None,):
         """
         Iterable object that handles the conversion of a config
         parser object to a list of section objects.
@@ -42,8 +42,10 @@ class ConfigSections(object):
 
 
         """
-        self._string_object = string_object or None
-        self._sections = {}
+        self._string_object = string_object or ''
+        self._ordered_dict_object = ordered_dict_object
+        self._section_object = section_object
+        self._sections = self._ordered_dict_object()
 
     def __call__(self, parser, encoding=None):
         """
@@ -70,10 +72,10 @@ class ConfigSections(object):
         # Adds the options to the section object
 
         for key in parser.options(section_name):
-            key = self._build_string_object(key, encoding)
             value = self._build_string_object(parser.get(section_name, key),
                                               encoding)
-            setattr(section, key, value)
+            key = self._build_string_object(key, encoding)
+            section[key] = value
 
     def _build_string_object(self, data, encoding=None):
         if self._string_object:
@@ -83,7 +85,7 @@ class ConfigSections(object):
 
     def get_section(self, section_name, encoding=None):
         """
-        Returns a ConfigSection object from this object's section
+        Returns a Section (aka dict) object from this object's section
         dictionary or creates a new ConfigSection object, which is
         stored int this object's section dictionary then is returned
 
@@ -92,16 +94,14 @@ class ConfigSections(object):
         if section_name in self._sections:
             return self._sections[section_name]
         else:
-            section = ConfigSection(section_name)
+            section = self._section_object(section_name)
             self._sections[section_name] = section
             return section
 
     def __getitem__(self, key):
-        key = normalize_key(key)
         return self._sections[key]
 
     def __getattr__(self, key):
-        key = normalize_key(key)
         try:
             out = self._sections[key]
         except KeyError:
@@ -115,61 +115,3 @@ class ConfigSections(object):
 
     def __len__(self):
         return len(self._sections)
-
-class ConfigSection(object):
-    """
-    A generic object to hold keys and values primarily from a config file
-
-    """
-    def __init__(self, title):
-        """
-        Holds keys and values primarily from a section of a config file
-
-        title:      The title of the section of the config file
-
-        """
-        self.___title___ = title
-        self.___options___ = {}
-
-
-    def get_title(self):
-        """
-        Returns the title of the section
-
-        """
-        return self.___title___
-
-    def __setattr__(self, key, value):
-        if key.startswith('___') and key.endswith('___'):
-            object.__setattr__(self, key, value)
-        else:
-            key = normalize_key(key)
-            if self.___options___.has_key(key):
-                self.___options___[key] = value
-            else:
-                dict.__setitem__(self.___options___, key, value)
-
-    def __getattr__(self, key):
-        if key.startswith('___') and key.endswith('___'):
-            return self.__dict__[key]
-        else:
-            key = normalize_key(key)
-            try:
-                out = self.___options___[key]
-            except KeyError:
-                return getattr(self.___options___, key)
-            else:
-                return out
-
-    def __getitem__(self, key):
-        key = normalize_key(key)
-        return self.___options___[key]
-
-    def __iter__(self, *args, **kargs):
-        return self.___options___.__iter__(*args, **kargs)
-
-
-def normalize_key(key):
-    key = unicode(key)
-    key = unicodedata.normalize('NFC', key)
-    return key