assorted PEP 8 fixes; mostly inline whitespace
Merge pull request #6620 from hulu/pep8-don-quixote

assorted PEP 8 fixes; mostly inline whitespace