Fix flake8 problems in diff code.

tags: #stylefix