Fix some Python 3.x issues that have slipped in.
Review Request #6327 — Created Sept. 15, 2014 and submitted — Latest diff uploaded
Since I initially did our 3.x porting, a few things have slipped in (mostly
merges from the 1.7.x branch, which doesn't have the same requirements).
Ran 2to3 and saw that the only reported issues are expected (presence of
__future__stuff, and code where we use six to update something but 2to3 can't
tell the difference).