Commit 343c2b08 authored by Tim Peters's avatar Tim Peters

Merge rev 27481 from 3.3 branch.

Forward port from Zope 2.7 branch.

The ConflictError.get_{old,new}_serial() methods each did what the other
was supposed to do.
parent fcac19d9
...@@ -83,6 +83,13 @@ before, it now says: ...@@ -83,6 +83,13 @@ before, it now says:
serial this txn started with 0x034414228c3728d5 2002-04-14 20:50:32.863000, serial this txn started with 0x034414228c3728d5 2002-04-14 20:50:32.863000,
serial currently committed 0x03441422948b4399 2002-04-14 20:50:34.815000) serial currently committed 0x03441422948b4399 2002-04-14 20:50:34.815000)
ConflictError
-------------
The undocumented ``get_old_serial()`` and ``get_new_serial()`` methods
were swapped (the first returned the new serial, and the second returned
the old serial).
Tools Tools
----- -----
......
...@@ -112,10 +112,10 @@ class ConflictError(TransactionError): ...@@ -112,10 +112,10 @@ class ConflictError(TransactionError):
return self.class_name return self.class_name
def get_old_serial(self): def get_old_serial(self):
return self.serials[0] return self.serials[1]
def get_new_serial(self): def get_new_serial(self):
return self.serials[1] return self.serials[0]
def get_serials(self): def get_serials(self):
return self.serials return self.serials
......
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