[Zodb-checkins] SVN: ZODB/trunk/src/ Bug fixed:

[Jim Fulton]

Log message for revision 116216:
  Bug fixed:
  
  The interface, ZODB.interfaces.IStorage was incorrect. The store
    method should never return a sequence of oid and serial pairs.
  

Changed:
  U   ZODB/trunk/src/CHANGES.txt
  U   ZODB/trunk/src/ZODB/interfaces.py

-=-
Modified: ZODB/trunk/src/CHANGES.txt
===================================================================
--- ZODB/trunk/src/CHANGES.txt	2010-09-07 18:44:45 UTC (rev 116215)
+++ ZODB/trunk/src/CHANGES.txt	2010-09-07 21:49:08 UTC (rev 116216)
@@ -18,6 +18,8 @@
   3.10.0b5.) Invalidating read data when there is a conflict error
   provides some extra insurance.
 
+- The interface, ZODB.interfaces.IStorage was incorrect. The store
+  method should never return a sequence of oid and serial pairs.
 
 3.10.0b5 (2010-09-02)
 =====================

Modified: ZODB/trunk/src/ZODB/interfaces.py
===================================================================
--- ZODB/trunk/src/ZODB/interfaces.py	2010-09-07 18:44:45 UTC (rev 116215)
+++ ZODB/trunk/src/ZODB/interfaces.py	2010-09-07 21:49:08 UTC (rev 116216)
@@ -680,15 +680,14 @@
 
         The return value may be:
 
-        - None
+        - None, or
 
-        - A new serial (string) for the object, or
+        - A new serial (string) for the object
 
-        - An iterable of object-id and serial pairs giving new serials
-          for objects.
+        If None is returned, then a new serial (or other special
+        values) must ve returned in tpc_vote results.
 
-        A serial, returned as a string or in a sequence of oid/serial
-        pairs, may be the special value
+        A serial, returned as a string, may be the special value
         ZODB.ConflictResolution.ResolvedSerial to indicate that a
         conflict occured and that the object should be invalidated.