[Zope3-checkins] CVS: Zope3/src/zope/app/startup - sitedefinition.py:1.9

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zope/app/startup
In directory cvs.zope.org:/tmp/cvs-serv13626/src/zope/app/startup

Modified Files:
	sitedefinition.py 
Log Message:
Track removal of DB helper functions from storage implementations.


=== Zope3/src/zope/app/startup/sitedefinition.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/startup/sitedefinition.py:1.8	Tue Feb 11 21:17:36 2003
+++ Zope3/src/zope/app/startup/sitedefinition.py	Tue Feb 25 16:49:24 2003
@@ -41,6 +41,7 @@
 from zope.app.services.servicenames import Utilities
 from zope.server.taskthreads import ThreadedTaskDispatcher
 
+from zodb.db import DB
 from zodb.code.module import PersistentModuleImporter
 from zope.app.services.interface import register
 
@@ -87,28 +88,28 @@
 
     def useFileStorage(self, _context, file=DEFAULT_STORAGE_FILE):
         """Lets you specify the ZODB to use."""
-        from zodb.storage.file import DB
+        from zodb.storage.file import FileStorage
         if self._zodb is not None:
             raise RuntimeError("Database already open")
-        self._zodb = DB(file)
+        self._zodb = DB(FileStorage(file))
         return []
 
 
     def useMappingStorage(self, _context):
         """Lets you specify the ZODB to use."""
-        from zodb.storage.mapping import DB
+        from zodb.storage.mapping import MappingStorage
         if self._zodb is not None:
             raise RuntimeError("Database already open")
-        self._zodb = DB()
+        self._zodb = DB(MappingStorage())
         return []
 
 
     def useBDBFullStorage(self, _context, **kws):
         from zodb.config import convertBDBStorageArgs
-        from zodb.storage.bdbfull import DB
+        from zodb.storage.bdbfull import BDBFullStorage
 
         kws = convertBDBStorageArgs(**kws)
-        self._zodb = DB(**kws)
+        self._zodb = DB(BDBFullStorage(**kws))
         return []