Comment 2 for bug 618311

This is the patch generated by bzr, which don't preserve removing of spaces to be compliant with pep8.

[They were 26 errors, there's only 1 now.]

[The other little change isn't really import, also fixes one pep8 error.]