pyupgrade cleanup

Douglas Raillard requested to merge github/fork/douglas-raillard-arm/_home_pr3 into master Nov 02, 2019