more python2 everywhere