Commit 08b78663 authored by Jim Fulton's avatar Jim Fulton

Updated to reflect fifferences in integer handling between Python 2.4

and 2.5.
parent 21122a05
...@@ -731,8 +731,8 @@ def multiple_storages_invalidation_queue_is_not_insane(): ...@@ -731,8 +731,8 @@ def multiple_storages_invalidation_queue_is_not_insane():
>>> trans, oids = s1.getInvalidations(last) >>> trans, oids = s1.getInvalidations(last)
>>> from ZODB.utils import u64 >>> from ZODB.utils import u64
>>> sorted([u64(oid) for (oid, v) in oids]) >>> sorted([int(u64(oid)) for (oid, v) in oids])
[10L, 11L, 12L, 13L, 14L] [10, 11, 12, 13, 14]
>>> server.close_server() >>> server.close_server()
""" """
...@@ -785,8 +785,8 @@ structure using lastTransactions. ...@@ -785,8 +785,8 @@ structure using lastTransactions.
>>> from ZODB.utils import u64 >>> from ZODB.utils import u64
>>> sorted([u64(oid) for (oid, version) in oids]) >>> sorted([int(u64(oid)) for (oid, version) in oids])
[0L, 92L, 93L, 94L, 95L, 96L, 97L, 98L, 99L, 100L] [0, 92, 93, 94, 95, 96, 97, 98, 99, 100]
(Note that the fact that we get oids for 92-100 is actually an (Note that the fact that we get oids for 92-100 is actually an
artifact of the fact that the FileStorage lastInvalidations method artifact of the fact that the FileStorage lastInvalidations method
...@@ -833,8 +833,8 @@ transaction, we'll get a result: ...@@ -833,8 +833,8 @@ transaction, we'll get a result:
>>> ntid == last[-1] >>> ntid == last[-1]
True True
>>> sorted([u64(oid) for (oid, version) in oids]) >>> sorted([int(u64(oid)) for (oid, version) in oids])
[0L, 101L, 102L, 103L, 104L] [0, 101, 102, 103, 104]
""" """
......
...@@ -508,11 +508,11 @@ Now, we can call lastInvalidations on it: ...@@ -508,11 +508,11 @@ Now, we can call lastInvalidations on it:
True True
>>> from ZODB.utils import u64 >>> from ZODB.utils import u64
>>> [[u64(oid) for (oid, version) in oids] >>> [[int(u64(oid)) for (oid, version) in oids]
... for (i, oids) in invalidations] ... for (i, oids) in invalidations]
... # doctest: +NORMALIZE_WHITESPACE ... # doctest: +NORMALIZE_WHITESPACE
[[0L, 91L], [0L, 92L], [0L, 93L], [0L, 94L], [0L, 95L], [[0, 91], [0, 92], [0, 93], [0, 94], [0, 95],
[0L, 96L], [0L, 97L], [0L, 98L], [0L, 99L], [0L, 100L]] [0, 96], [0, 97], [0, 98], [0, 99], [0, 100]]
If we ask for more transactions than there are, we'll get as many as If we ask for more transactions than there are, we'll get as many as
there are: there are:
......
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