Pylint fixes

A bunch of illegal py 2.4 constructs that were spot by inspecting the latest results in our pylint dedicated box, this pachset fixes them.