Make a bunch of smaller 2to3 related refactors.
Review Request #6681 — Created Dec. 7, 2014 and submitted — Latest diff uploaded
This change makes a bunch of small updates to bring code into compliance with
both Python 2.x and 3.x.
- Ran unit tests.
- Posted some changes.