Fix `pep8` `W291` and `E231` issues.

* W291: Trailing white space
* E231: Missing white-space after comma.
Minor formatting changes. Double to single quotes.
Merge pull request #7431 from s0undt3ch/hotfix/lint

Fix `pep8` `W291` and `E231` issues.