Other 2to3 changes

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>