master: use 2to3 to fix zip() incompatiable