Fixed pep8 test fails introduced by pep8 v1.50.
Merge pull request #1080 from pp-mo/pep8_1v50

Fixed pep8 test fails introduced by pep8 v1.50.