This change doesn't seem to be PEP-8 related. I recommend making it in a separate commit so the commits are atomic.
LGTM.
rebased
Thanks for the review :)
Pull-Request has been merged by pingou
Sorry about this one, when I rebased the branch there were conflicts, I fixed them and then forgot to adjust the commit as advised :(