Fixed up some more flake8 violations (this particular violation still has many occurrences in the tests/ dir so it can't be removed from setup.cfg yet)
Fix all violators of E231
Fixed #21335 -- Use importlib from python3 when using python3