py2.6 support for testing
more py2.6 fixes