Fix the test so it doesn't fail under Python 2.5.
fix lint.