flake8 testing was enabled in !31551 (merged) but due to to a typo it never ran. Fix typo and make the files compliant. The whitespace changes are intentional in order to avoid mixing tabs and spaces.