mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #1717: Remove cmp. Stage 1: remove all uses of cmp and __cmp__ from

Browse source 
the standard library and tests.
This commit is contained in:
Mark Dickinson 2009-01-27 18:17:45 +00:00
parent 191e850053
commit a56c467ac3
32 changed files with 210 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Tools/unicode/makeunicodedata.py
View file

@ -457,15 +457,6 @@ def makeunicodetype(unicode, trace):
# --------------------------------------------------------------------
# unicode name database
def CmpToKey(mycmp):
'Convert a cmp= function into a key= function'
class K(object):
def __init__(self, obj, *args):
self.obj = obj
def __lt__(self, other):
return mycmp(self.obj, other.obj) == -1
return K
def makeunicodename(unicode, trace):
FILE = "Modules/unicodename_db.h"
@ -508,14 +499,10 @@ def makeunicodename(unicode, trace):
wordlist = list(words.items())
# sort on falling frequency, then by name
def cmpwords(a,b):
def word_key(a):
aword, alist = a
bword, blist = b
r = -cmp(len(alist),len(blist))
if r:
return r
return cmp(aword, bword)
wordlist.sort(key=CmpToKey(cmpwords))
return -len(alist), aword
wordlist.sort(key=word_key)
# figure out how many phrasebook escapes we need
escapes = 0