[MERGE] selftest broken on Python 2.5.1 - #123485

[Ian Clatworthy]

Fix as suggested by poolie and spiv for #123485 attached. The test suite
now passes again for me with this change.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 123485.patch
Type: text/x-patch
Size: 1263 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070703/0d0b457a/attachment.bin