TST: py2.5 compatibility - no with