In this file there are again some unrelated changes breaking PEP8. It would be best if you reverse them.

Generally do not mix style changes (especially to other people's code) with new code in the same commits - it makes it harder to use `git blame` to search for regressions.