pep8 fixes
pylint fixes
Merge pull request #9005 from makinacorpus/lint-fixes

Lint fixes