[Python-checkins] r67869 - python/branches/py3k-issue1717/Tools/unicode/makeunicodedata.py

[mark.dickinson]

Author: mark.dickinson
Date: Sat Dec 20 11:28:00 2008
New Revision: 67869

Log:
Replace use of cmp in Tools/unicode/makeunicodedata.py


Modified:
   python/branches/py3k-issue1717/Tools/unicode/makeunicodedata.py

Modified: python/branches/py3k-issue1717/Tools/unicode/makeunicodedata.py
==============================================================================
--- python/branches/py3k-issue1717/Tools/unicode/makeunicodedata.py	(original)
+++ python/branches/py3k-issue1717/Tools/unicode/makeunicodedata.py	Sat Dec 20 11:28:00 2008
@@ -511,10 +511,18 @@
     def cmpwords(a,b):
         aword, alist = a
         bword, blist = b
-        r = -cmp(len(alist),len(blist))
-        if r:
-            return r
-        return cmp(aword, bword)
+        len_alist, len_blist = len(alist), len(blist)
+        if len_alist != len_blist:
+            if len_alist < len_blist:
+                return 1
+            else:
+                return -1
+        if aword != bword:
+            if aword < bword:
+                return -1
+            else:
+                return 1
+        return 0
     wordlist.sort(key=CmpToKey(cmpwords))
 
     # figure out how many phrasebook escapes we need