Fixing pylint errors
Merge pull request #8570 from techhat/pylint

Fixing pylint errors