Convert to Python 3 with 2to3.
Merge with Python 3 version