[MERGE] selftest broken on Python 2.5.1 - #123485

[Andrew Bennetts]

Andrew Bennetts has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
+1 if you use the basename of the filename as Martin suggests in the 
comments on the bug (we've been bitten by this code already, we may as 
well be paranoid).

It'll be good to have tests passing on 2.5.1 again!

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C4689D1BE.4010508%40internode.on.net%3E