pep8 whitespace fixes
Merge pull request #5526 from hulu/pep8-more

pep8 whitespace fixes