remove some more references to __cmp__ #1717
8 files changed