[Zope3-checkins] CVS: Zope3/src/zodb - export.py:1.3.4.2 serialize.py:1.7.4.2

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv10639

Modified Files:
      Tag: storage-interface-branch
	export.py serialize.py 
Log Message:
Fix some search-and-replace on new_oid gone wrong.


=== Zope3/src/zodb/export.py 1.3.4.1 => 1.3.4.2 ===
--- Zope3/src/zodb/export.py:1.3.4.1	Wed Feb  5 12:30:11 2003
+++ Zope3/src/zodb/export.py	Wed Feb  5 17:44:02 2003
@@ -120,7 +120,7 @@
             oid = h[:8]
             new_ref = copier.oids.get(oid)
             if new_ref is None:
-                newObjectId = self._stornewObjectId_oid()
+                newObjectId = self._storage.newObjectId()
                 copier.oids[oid] = newObjectId, None
                 return_oid_list.append(newObjectId)
                 self._created.add(newObjectId)


=== Zope3/src/zodb/serialize.py 1.7.4.1 => 1.7.4.2 ===
--- Zope3/src/zodb/serialize.py:1.7.4.1	Wed Feb  5 12:30:11 2003
+++ Zope3/src/zodb/serialize.py	Wed Feb  5 17:44:02 2003
@@ -271,7 +271,7 @@
             classmeta = None
         new_ref = self._cache.get(oid)
         if new_ref is None:
-            newObjectId = self._stornewObjectId_oid()
+            newObjectId = self._storage.newObjectId()
             self._created.add(newObjectId)
             self._cache[oid] = new_ref = newObjectId, classmeta
         return CopyReference(new_ref)