Python3 adoption:

* fix 2to3 failure issues.