[Zope-Checkins] CVS: Zope/lib/python/ZODB - DB.py:1.36.2.1

Matthew T. Kromer matt@zope.com
Wed, 28 Nov 2001 12:15:42 -0500


Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv11240

Modified Files:
      Tag: Zope-2_5-branch
	DB.py 
Log Message:
Back out recent change to PersistentMapping


=== Zope/lib/python/ZODB/DB.py 1.36 => 1.36.2.1 ===
-#
+# 
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
@@ -72,20 +72,15 @@
         self._storage=storage
         storage.registerDB(self, None)
         if not hasattr(storage,'tpc_vote'): storage.tpc_vote=lambda *args: None
-        try:
-            storage.load('\0\0\0\0\0\0\0\0','')
-        except KeyError:
-            # Create the database's root in the storage if it doesn't exist
+        try: storage.load('\0\0\0\0\0\0\0\0','')
+        except:
             import PersistentMapping
-            root = PersistentMapping.PersistentMapping()
-            # Manually create a pickle for the root to put in the storage.
-            # The pickle must be in the special ZODB format.
-            file = cStringIO.StringIO()
-            p = cPickle.Pickler(file, 1)
-            p.dump((root.__class__, None))
-            p.dump(root.__getstate__())
-            t = Transaction()
-            t.description = 'initial database creation'
+            file=cStringIO.StringIO()
+            p=cPickle.Pickler(file,1)
+            p.dump((PersistentMapping.PersistentMapping,None))
+            p.dump({'_container': {}})
+            t=Transaction()
+            t.description='initial database creation'
             storage.tpc_begin(t)
             storage.store('\0\0\0\0\0\0\0\0', None, file.getvalue(), '', t)
             storage.tpc_vote(t)