Thanks, Antoine. Here's a new patch.
> - two files have unwanted modifications on non-ASCII characters
> (Lib/heapq.py and Lib/sqlite3/test/hooks.py)
Fixed, I think. Could you double check?
> - you haven't renamed "__cmp__" to "_cmp" in Lib/xmlrpc/client.py:
> deliberate?
Not deliberate! This __cmp__ should simply be removed, I think---the rich
comparison methods are already present.
> - in Lib/heapq.py, there's a "_cmp__" which should be "_cmp"
Replaced "_cmp__" (which was in a comment) with "comparison".