Run 2to3 and fix test failures.
Still only runs on python 2, but it's a start.