Fix 2to3 warnings during build
Merge pull request #2094 from mdboom/2to3-warnings-fix

Parsing errors when installing 1.3.0rc2