Python 3 fixes via the 2to3 compatibility script.
The command used was: 2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
Authored by: bugman 2014-09-04
Parent: [r25628]
Child: [r25630]