Port fix of flake8 to branch master

Adding to that: this is the master (8.0 ?) branch, so the `-b 7.0` probably needs to be fixed