Changeset 923:fe2a902681bc

Timestamp:

04/27/19 12:11:14 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Eliminated calls to cmp() (re #347).

Location:

src/mlx

Files:

• gui/timetable.py (modified) (1 diff)
• rpc.py (modified) (3 diffs)
• web.py (modified) (1 diff)

src/mlx/gui/timetable.py

@@ -752 +752 @@
         planes = [plane for plane in fleet
                   if plane.aircraftType == aircraftType]
-        planes.sort(cmp = lambda p1, p2: cmp(p1.tailNumber, p2.tailNumber))
+        planes.sort(key = lambda p: p.tailNumber)
 
         dialog = BookDialog(self, flightPair, planes)

src/mlx/rpc.py

@@ -111 +111 @@
                 cs1 = int(self.callsign[2:])
                 cs2 = int(other.callsign[2:])
-                return cmp(cs1, cs2)
+                return 0 if cs1==cs2 else -1 if cs1<cs2 else 1
             except:
-                return cmp(self.callsign, other.callsign)
+                return 0 if self.callsign==other.callsign \
+                    else -1 if self.callsign<other.callsign else 1
         else:
-            return cmp(getattr(self, name), getattr(other, name))
+            v1 = getattr(self, name)
+            v2 = getattr(other, name)
+            return 0 if v1==v2 else -1 if v1<v2 else 1
 
     def __repr__(self):
@@ -166 +169 @@
                 flightPairs.append(ScheduledFlightPair(flight))
 
-        flightPairs.sort(cmp = lambda pair1, pair2:
-                         cmp(pair1.flight0.date, pair2.flight0.date))
+        flightPairs.sort(key = lambda pair: pair.flight0.date)
 
         return flightPairs
@@ -523 +525 @@
 
         for flights in [bookedFlights, reportedFlights, rejectedFlights]:
-            flights.sort(cmp = lambda flight1, flight2:
-                         cmp(flight1.departureTime, flight2.departureTime))
+            flights.sort(key = lambda flight: flight.departureTime)
 
         return (bookedFlights, reportedFlights, rejectedFlights)

src/mlx/web.py

@@ -791 +791 @@
                 result.flights.append(flight)
 
-            result.flights.sort(cmp = lambda flight1, flight2:
-                                cmp(flight1.departureTime,
-                                    flight2.departureTime))
+            result.flights.sort(key = lambda flight: flight.departureTime)
 
         f.close()