Stuff like this looks kinda ugly to me with the autoformatting.

I would still suggest merging the changes in, and changing them to look better without violating pep8 whenever code is touched.