[Zope-CVS] CVS: Products/AdaptableStorage/serial - DeserializationEvent.py:1.3

Shane Hathaway shane@zope.com
Sat, 7 Dec 2002 00:59:43 -0500


Update of /cvs-repository/Products/AdaptableStorage/serial
In directory cvs.zope.org:/tmp/cvs-serv21888/serial

Modified Files:
	DeserializationEvent.py 
Log Message:
Fixed the bugs in the new strategy (OIDs no longer include mapper_names, 
allowing more flexibility in loading and storage).  Did not resolve new
key generation yet, but everything else seems to be in good shape.


=== Products/AdaptableStorage/serial/DeserializationEvent.py 1.2 => 1.3 ===
--- Products/AdaptableStorage/serial/DeserializationEvent.py:1.2	Fri Dec  6 17:06:50 2002
+++ Products/AdaptableStorage/serial/DeserializationEvent.py	Sat Dec  7 00:59:13 2002
@@ -36,15 +36,11 @@
         """See the IDeserializationEvent interface."""
         self._loaded_refs[(self._aspect_name, name)] = value
 
-    def dereference(self, name, keychain):
+    def dereference(self, name, keychain, mapper_names=None):
         """Retrieves a referenced subobject (usually ghosted initially).
         """
-##        dm = self.getObjectMapper().getDomainMapper()
-##        assert keychain is not None
-##        mapper = dm.getMapper(mapper_name)
-##        class_info = mapper.getSerializer().getClassInfo()
         kos = self.getKeyedObjectSystem()
-        ob = kos.loadStub(keychain) #, class_info)
+        ob = kos.loadStub(keychain, mapper_names)
         self.notifyDeserialized(name, ob)
         return ob