[#7878] Used 2to3 to see what issues would come up
681 files changed