Fix flake8

issue3185
review834002