Code cleaning and refactoring without side effect.
py2compat
15 months ago, Edouard Tisserant