While you're at it, would you try to have these new imports following the order of what the tool "isort" would do? But please only keep the changes on like new lines, not reordering existing ones too much.

I already tried to change everywhere, but I didn't manage to have a perfectly tuned config. And made hard to read diffs. But we are still tending towards this.

Using isort the/file/path.py, without any config, does a correct enough job to the new lines+their placement, and will greatly reduce the diff of when we will be applying isort everywhere (I hope in the 1-1.5 year timeframe)