From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 23 Feb 2012 16:59:16 +0000 (-0500)
Subject: Make sort() use key= rather than cmp. All regression tests pass.
X-Git-Tag: 2.2~64
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=084fa080abf7940f33b9173dd173f1982fe3194e;hp=d07b7b4c26776011f703a7a4ed5ae792bfc46bea;ds=sidebyside

Make sort() use key= rather than cmp. All regression tests pass.
---

diff --git a/sst.py b/sst.py
index 0ef0f09..7ca6caa 100755
--- a/sst.py
+++ b/sst.py
@@ -745,7 +745,7 @@ def supercommander():
         for (i, base) in enumerate(game.state.baseq):
             basetbl.append((i, (base - sc).distance()))
         if game.state.baseq > 1:
-            basetbl.sort(lambda x, y: cmp(x[1], y[1]))
+            basetbl.sort(key=lambda x: x[1])
         # look for nearest base without a commander, no Enterprise, and
         # without too many Klingons, and not already under attack. 
         ifindit = iwhichb = 0
@@ -5734,7 +5734,7 @@ def newkling():
 
 def sortenemies():
     "Sort enemies by distance so 'nearest' is meaningful."
-    game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist))
+    game.enemies.sort(key=lambda x: x.kdist)
 
 def newqad():
     "Set up a new state of quadrant, for when we enter or re-enter it."