Fix PEP-8 E302, E303, W291
Fix PEP-8 W293, E302
Merge pull request #7666 from s0undt3ch/hotfix/lint

Some PEP8 Lint fixes