[Zodb-checkins] CVS: ZODB3/ZODB/zodb4 - conversion.py:1.1.2.5

[Fred L. Drake, Jr.]

Update of /cvs-repository/ZODB3/ZODB/zodb4
In directory cvs.zope.org:/tmp/cvs-serv8216

Modified Files:
      Tag: zope3-zodb3-devel-branch
	conversion.py 
Log Message:
if we have args for __new__(), toss them instead of supporting the
ghost-creation optimization; ZODB3 doesn't handle that the same way as
ZODB4 at all


=== ZODB3/ZODB/zodb4/conversion.py 1.1.2.4 => 1.1.2.5 ===
--- ZODB3/ZODB/zodb4/conversion.py:1.1.2.4	Fri Jan 30 16:12:39 2004
+++ ZODB3/ZODB/zodb4/conversion.py	Fri Jan 30 16:26:49 2004
@@ -78,9 +78,10 @@
         if isinstance(ident, tuple):
             self._oid, self._class = ident
             if isinstance(self._class, tuple):
-                self._class, self._args = self._class
-            else:
-                self._args = None
+                # we have args from __getnewargs__(), but can just
+                # lose them since they're an optimization to allow
+                # ghost construction
+                self._class = None
         else:
             assert isinstance(ident, str)
             self._oid = ident