Fix python2 compat

4 jobs for master in 1 minute and 17 seconds