Unfortunately, these changes are most of the time made as small extra
changes when people are working in distutils modules :

they fix something, and in the same changeset, they fix a small PEP-8
issue in the area they are working on.

So it seems hard to merge back the revisions.

What I am doing now (if you think it's OK), is running a diff so my
changes make the trunk look like Py3's one in this area..