Changes in src/mlx/rpc.py [908:fcf3c44650f1:889:5f3b3d4a9957]

File:

• src/mlx/rpc.py (modified) (9 diffs)

src/mlx/rpc.py

@@ -208 +208 @@
                       "TU5"  : const.AIRCRAFT_T154,
                       "YK4"  : const.AIRCRAFT_YK40,
-                      "146"  : const.AIRCRAFT_B462,
-                      "IL6"  : const.AIRCRAFT_IL62 }
+                      "146"  : const.AIRCRAFT_B462 }
 
     # FIXME: copied from web.BookedFlight
@@ -229 +228 @@
                       const.AIRCRAFT_T154  : "TU5",
                       const.AIRCRAFT_YK40  : "YK4",
-                      const.AIRCRAFT_B462  : "146",
-                      const.AIRCRAFT_IL62  : "IL6" }
+                      const.AIRCRAFT_B462  : "146" }
 
     # FIXME: copied from web.BookedFlight
@@ -236 +234 @@
     def _decodeAircraftType(typeCode):
         """Decode the aircraft type from the given typeCode."""
-        if typeCode in const.icao2Type:
-            return const.icao2Type[typeCode]
+        if typeCode in BookedFlight.TYPECODE2TYPE:
+            return BookedFlight.TYPECODE2TYPE[typeCode]
         else:
             raise Exception("Invalid aircraft type code: '" + typeCode + "'")
@@ -277 +275 @@
     _instructions = {
         "numPassengers" : int,
-        "numCockpitCrew" : int,
-        "numCabinCrew" : int,
+        "numCrew" : int,
         "bagWeight" : int,
         "cargoWeight" : int,
@@ -310 +307 @@
         print >> f, "tail_nr=%s" % (self.tailNumber,)
         print >> f, "passenger=%d" % (self.numPassengers,)
-        print >> f, "crew=%d" % (self.numCockpitrew + self.numCabinCrew,)
+        print >> f, "crew=%d" % (self.numCrew,)
         print >> f, "bag=%d" % (self.bagWeight,)
         print >> f, "cargo=%d" % (self.cargoWeight,)
@@ -379 +376 @@
         for planeValue in value:
             self._addPlane(Plane(planeValue))
-
-#---------------------------------------------------------------------------------------
-
-class AircraftTypeInfo(RPCObject):
-    """Information about an aircraft type."""
-    # The instructions for the construction
-    _instructions = {
-        "dow" : int,
-        "dowCockpit" : int,
-        "dowCabin" : int,
-        }
-
-    def __init__(self, value):
-        """Construct the booked flight object from the given RPC result
-        value."""
-        super(AircraftTypeInfo, self).__init__(value,
-                                               AircraftTypeInfo._instructions)
-        self.aircraftType = const.icao2Type[value["typeCode"]]
 
 #---------------------------------------------------------------------------------------
@@ -519 +498 @@
             self._sessionID = reply.value["sessionID"]
 
-            types = [const.icao2Type[typeCode]
+            types = [BookedFlight.TYPECODE2TYPE[typeCode]
                      for typeCode in reply.value["typeCodes"]]
 
@@ -525 +504 @@
         else:
             return None
-
-    def getTypes(self):
-        """Get the data of the aircraft types supported by us."""
-        value = self._performCall(lambda sessionID:
-                                  self._server.getTypes(sessionID))
-
-        return [AircraftTypeInfo(t) for t in value]
 
     def getFlights(self):
@@ -627 +599 @@
         of type codes, if any."""
         typeCodes = None if types is None else \
-          [const.icaoCodes[type] for type in types]
+            [BookedFlight.TYPE2TYPECODE[type] for type in types]
 
         values = self._performCall(lambda sessionID: