[Zope3-checkins] CVS: ZODB4/src/zodb - conflict.py:1.6.10.1

[Barry Warsaw]

Update of /cvs-repository/ZODB4/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv31106/src/zodb

Modified Files:
      Tag: opaque-pickles-branch
	conflict.py 
Log Message:
The start of opaque pickles (from the p.o.v. of the storages).  This
will eventually allow us to pass compressed pickles to the storage if
we want.

The approach basically changes store() so that the data argument is a
2-tuple of the pickle and the list of oids referenced in the pickle.
This is the first step in the changes, but currently, only Berkeley
storages natively store the refs included in the store() API call.

Changes here include:

_resolve(): Return just the data from the .getState() call.  Since
that method now returns a tuple, just return the 1st element, which
will be the pickle data.


=== ZODB4/src/zodb/conflict.py 1.6 => 1.6.10.1 ===
--- ZODB4/src/zodb/conflict.py:1.6	Wed Jan 15 18:28:00 2003
+++ ZODB4/src/zodb/conflict.py	Mon Feb 10 17:50:12 2003
@@ -177,4 +177,4 @@
 
         writer = ResolvedObjectWriter()
         obj = ResolvedObjectAdapter(get_self(resolve), resolved)
-        return writer.getState(obj)
+        return writer.getState(obj)[0]