Added modular DAL, updated gluon imports to new structure

gluon/tests/test_dal.py

@@ -48,7 +48,9 @@ DEFAULT_URI = os.environ.get('DB', 'sqlite:memory')
 
 print 'Testing against %s engine (%s)' % (DEFAULT_URI.partition(':')[0], DEFAULT_URI)
 
-from dal import DAL, Field, Table, SQLALL
+from dal import DAL, Field
+from dal.objects import Table
+from dal.helpers.classes import SQLALL
 
 ALLOWED_DATATYPES = [
     'string',

gluon/tests/test_dal_nosql.py

@@ -57,7 +57,7 @@ IS_MONGODB = "mongodb" in DEFAULT_URI
 IS_IMAP = "imap" in DEFAULT_URI
 
 if IS_IMAP:
-    from dal import IMAPAdapter
+    from dal.adapters import IMAPAdapter
     from contrib import mockimaplib
     IMAPAdapter.driver = mockimaplib