Make f05a655 compatible through Python 2.5