[Zope-CVS] CVS: Products/DBTab - CHANGES.txt:1.6 DBTab.py:1.9 MainConfiguration.py:1.6

[Shane Hathaway]

Update of /cvs-repository/Products/DBTab
In directory cvs.zope.org:/tmp/cvs-serv14104

Modified Files:
	CHANGES.txt DBTab.py MainConfiguration.py 
Log Message:
Removed the direct connection to AdaptableStorage.


=== Products/DBTab/CHANGES.txt 1.5 => 1.6 ===
--- Products/DBTab/CHANGES.txt:1.5	Thu Feb  6 16:17:52 2003
+++ Products/DBTab/CHANGES.txt	Sat Mar 15 20:29:25 2003
@@ -1,4 +1,11 @@
 
+Next release (1.2?)
+
+  - Removed import of AdaptableStorage.  Argument converters now work
+    when you specify the full module of a storage class.
+
+
+
 Version 1.1
 
   - Changed DBTab's mounting strategy so that mounted connections stay


=== Products/DBTab/DBTab.py 1.8 => 1.9 ===
--- Products/DBTab/DBTab.py:1.8	Mon Jan  6 11:56:38 2003
+++ Products/DBTab/DBTab.py	Sat Mar 15 20:29:25 2003
@@ -75,13 +75,14 @@
             module = c[:pos]
             c = c[pos + 1:]
         converter = None
-        if not module:
-            # Use a default module and argument converter.
-            info = storage_types.get(c)
-            if not info:
-                raise DBTabConfigurationError(
-                    'Unknown storage type: %s' % c)
-            module, converter = info
+        info = storage_types.get(c)
+        if info:
+            if not module or info[0] == module:
+                # Use a default argument converter and maybe a default module.
+                module, converter = info
+        elif not module:
+            raise DBTabConfigurationError(
+                'Unknown storage type: %s' % c)
         m = __import__(module, globals(), locals(), [c])
         self.storage_class = getattr(m, c)
 


=== Products/DBTab/MainConfiguration.py 1.5 => 1.6 ===
--- Products/DBTab/MainConfiguration.py:1.5	Mon Jan  6 11:56:38 2003
+++ Products/DBTab/MainConfiguration.py	Sat Mar 15 20:29:25 2003
@@ -21,12 +21,6 @@
 from DBTab import DBTab
 from Exceptions import DBTabOverrideError
 
-try:
-    # Get the AdaptableStorage types registered, if available.
-    import Products.AdaptableStorage.StorageTypesConfiguration
-except ImportError:
-    pass
-
 # Read the configuration from $INSTANCE_HOME/dbtab.conf if available,
 # otherwise fall back to dbtab.conf.in.
 main_fn = os.path.join(INSTANCE_HOME, 'dbtab.conf')