1 files changed, 12 insertions, 11 deletions

diff --git a/dodai/config/databases/__init__.py b/dodai/config/databases/__init__.py
index 459ee1b..da317e8 100644
--- a/dodai/config/databases/__init__.py
+++ b/dodai/config/databases/__init__.py
@@ -48,15 +48,15 @@ class ConfigDatabases(object):
     def _build_default_handler(self):
         # Creates the default sqlalchemy handler
         if 'sa' not in self._handlers:
-            from .sa import Sa
+            from dodai.config.databases.sa import Sa
             from sqlalchemy.orm import sessionmaker
             from sqlalchemy import create_engine
-            from ....db import Db
+            from dodai.db import Db
             sa = Sa(create_engine, sessionmaker, Db)
             self._handlers['sa'] = sa
 
     def add_handler(self, name, handler):
-        """Addes the given handler and name to this objects handlers
+        """Adds the given handler and name to this objects handlers
 
         """
         self._handlers[name] = obj
@@ -120,13 +120,14 @@ class DatabaseConnectionValidator(object):
     def load(self):
         if not self.obj:
             self._validate()
-            self.obj = self.handler.load(self.section)
+            handler = self._get_handler()
+            self.obj = handler(self.name, self.section)
         return self.obj
 
-    def _set_handler(self):
+    def _get_handler(self):
         if hasattr(self.section, 'handler'):
             name = self.section.handler.lower()
-            if handler in self.handlers.keys():
+            if handler in self._handlers.keys():
                 return self._handlers[name]
         return self._handlers[self.DEFAULT_HANDLER]
 
@@ -182,14 +183,14 @@ class DatabaseConnectionValidator(object):
             return False
 
     def _database_type(self):
-        keys = self.section.__dict__.keys()
+        keys = self.section.___options___.keys()
         for type_, pool in self.OPTIONS_REQUIRED.items():
             out = True
             for key in keys:
                 if key not in pool:
                     out = False
             if out:
-                return type
+                return type_
         return False
 
 
@@ -321,13 +322,13 @@ class DatabaseConnectionException(Exception):
     def __init__(self, section_name, options_required):
         self.section_name = section_name
         self.options_required = options_required
-        self.msg = self._build_message
+        self.msg = self._build_message()
 
     def _build_message(self):
         out = []
         out.append(self.MESSAGE.format(section_name=self.section_name))
-        for database_type, options in self.options_required:
-            options = list_to_englis(options)
+        for database_type, options in self.options_required.items():
+            options = list_to_english(options)
             out.append(self.MSG_TYPE.format(database_type=database_type,
                                             options=options))
         out.append(self.MSG_END)