remove python 2.5 compatibility imports
fix a test failures under python2