py2 support

This seemed to be the only thing causing test failures.