Migrated to 3.2 #5336

Also, Flake8ified