pep8 cleanup

now all tests pass under Python 3!