1 files changed, 25 insertions, 16 deletions

diff --git a/dodai/config/__init__.py b/dodai/config/__init__.py
index 6c3011c..e849f8e 100644
--- a/dodai/config/__init__.py
+++ b/dodai/config/__init__.py
@@ -25,25 +25,36 @@ class Config(object):
                 setattr(obj, key, val)
         return obj
 
-    def __getattr__(self, key):
-
-        if 'files' == key:
+    @property
+    def files(self):
+        if not hasattr(self, '_files'):
             from dodai.config.files import ConfigFiles
             from dodai.tools.odict import OrderedDict
             from dodai.tools import Section
             from dodai.tools.himo import String2Himo
+            from ConfigParser import ConfigParser
             s2h = String2Himo()
-            self.files = ConfigFiles(OrderedDict, Section, s2h)
-            return self.files
-        elif 'options' == key:
+            self._files = ConfigFiles(OrderedDict, Section, s2h)
+            self._files.register_parser_object(ConfigParser)
+        return self._files
+
+    @property
+    def options(self):
+        if not hasattr(self, '_options'):
             from dodai.config.option import ConfigOption
-            self.options = ConfigOption()
-            return self.options
-        elif 'logs' == key:
+            self._options = ConfigOption()
+        return self._options
+
+    @property
+    def logs(self):
+        if not hasattr(self, '_logs'):
             from dodai.config.log import ConfigLog
-            self.logs = ConfigLog()
-            return self.logs
-        elif 'databases' == key:
+            self._logs = ConfigLog()
+        return self._logs
+
+    @property
+    def databases(self):
+        if not hasattr(self, '_databases'):
             # Wire up the sqlalchemy objects to use in the sa object
             # which will be used as the default database handler
             from dodai.config.databases import ConfigDatabases
@@ -52,10 +63,8 @@ class Config(object):
             from sqlalchemy import create_engine
             from dodai.db import Db
             sa = Sa(create_engine, sessionmaker, Db)
-            self.databases = ConfigDatabases(sa, 'sa')
-            return self.databases
-        else:
-            raise KeyError(key)
+            self._databases = ConfigDatabases(sa, 'sa')
+        return self._databases
 
     def set(self, key, val):
         if not hasattr(self, 'vars'):