Base 2to3 changes for Python 3 support

Proposed base changes for Python 3 support