Ran 2to3 to allow 'make test' to run.