Ran 2to3.py and fixed remaining errors

All tests produce the same output running in Python 3.3 as they did
running in Python 2.7 previously.