Revert "Back to Python 2.x"

This reverts commit 0751a1a03c649c6e436b41de7c2c526b1f4d2af4.
Str specific Py3 changes