Mikael Lyngvig writes:

I just noticed that the changes below also apply to cmpcache.py, which
is virtually identical to cmp.py.