Seems like this is the root of the commit.  I would consider making this one changeset, and the rest of the PEP8/cosmetic changes (which are great) another one.