Commit 28bd47b2 authored by Jim Fulton's avatar Jim Fulton

Added more detail on return values.

Fixed a typo.
parent 9037f447
...@@ -614,6 +614,12 @@ class IStorage(Interface): ...@@ -614,6 +614,12 @@ class IStorage(Interface):
- An iterable of object-id and serial pairs giving new serials - An iterable of object-id and serial pairs giving new serials
for objects. for objects.
A serial, returned as a string or in a sequence of oid/serial
pairs, may be the special value
ZODB.ConflictResolution.ResolvedSerial to indicate that a
conflict occured and that the object should be invalidated.
""" """
def tpc_abort(transaction): def tpc_abort(transaction):
...@@ -663,8 +669,14 @@ class IStorage(Interface): ...@@ -663,8 +669,14 @@ class IStorage(Interface):
The return value can be either None or a sequence of object-id The return value can be either None or a sequence of object-id
and serial pairs giving new serials for objects who's ids were and serial pairs giving new serials for objects who's ids were
passed to previous store calls in the same transaction. passed to previous store calls in the same transaction.
After the tpc_vote call, bew serials must have been returned, After the tpc_vote call, new serials must have been returned,
either from tpc_vote or store for objects passed to store. either from tpc_vote or store for objects passed to store.
A serial returned in a sequence of oid/serial pairs, may be
the special value ZODB.ConflictResolution.ResolvedSerial to
indicate that a conflict occured and that the object should be
invalidated.
""" """
class IStorageRestoreable(IStorage): class IStorageRestoreable(IStorage):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment