[Zope3-checkins] CVS: Zope3/src/zodb - serialize.py:1.22.20.1

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	serialize.py 
Log Message:
Reimplemented the ContainedProxy to be a persistent proxy.

Had to make some changes to zodb to support persistent proxies.
I've termorarily broken conflict resolution.



=== Zope3/src/zodb/serialize.py 1.22 => 1.22.20.1 ===
--- Zope3/src/zodb/serialize.py:1.22	Thu Jun 19 17:41:10 2003
+++ Zope3/src/zodb/serialize.py	Wed Sep 17 09:00:47 2003
@@ -79,7 +79,7 @@
         newargs = getattr(obj, "__getnewargs__", None)
         if newargs is not None:
             newargs = newargs()
-    return obj.__class__, newargs
+    return type(obj), newargs
 
 class RootJar:
     def newObjectId(self):