update after python-modernize and 2to3