Some changes as identified by the Python 2 to 3 upgrade script /usr/bin/2to3.
Authored by: bugman 2014-07-25
Parent: [r24755]
Child: [r24757]