Cleanup __class__ comparisons (secdev#3127)

scapy/contrib/automotive/bmw/definitions.py

@@ -336,8 +336,8 @@ class DEV_JOB_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == DEV_JOB \
-            and self.identifier == other.identifier
+        return isinstance(other, DEV_JOB) and \
+            self.identifier == other.identifier
 
 
 UDS.services[0xBF] = "DevelopmentJob"

scapy/contrib/automotive/bmw/hsfz.py

@@ -48,12 +48,6 @@ def hashret(self):
         pay_hash = self.payload.hashret()
         return hdr_hash + pay_hash
 
-    def answers(self, other):
-        # type: (Packet) -> int
-        if other.__class__ == self.__class__:
-            return self.payload.answers(other.payload)
-        return 0
-
     def extract_padding(self, s):
         # type: (bytes) -> Tuple[bytes, bytes]
         return s[:self.length - 2], s[self.length - 2:]

scapy/contrib/automotive/doip.py

@@ -141,7 +141,7 @@ class DoIP(Packet):
     def answers(self, other):
         # type: (Packet) -> int
         """DEV: true if self is an answer from other"""
-        if other.__class__ == self.__class__:
+        if isinstance(other, type(self)):
             if self.payload_type == 0:
                 return 1
 

scapy/contrib/automotive/gm/gmlan.py

@@ -96,7 +96,7 @@ def determine_len(x):
     ]
 
     def answers(self, other):
-        if other.__class__ != self.__class__:
+        if not isinstance(other, type(self)):
             return False
         if self.service == 0x7f:
             return self.payload.answers(other)
@@ -165,7 +165,7 @@ class GMLAN_RFRDPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_RFRD and \
+        return isinstance(other, GMLAN_RFRD) and \
             other.subfunction == self.subfunction
 
 
@@ -301,7 +301,7 @@ class GMLAN_RDBIPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_RDBI and \
+        return isinstance(other, GMLAN_RDBI) and \
             other.dataIdentifier == self.dataIdentifier
 
 
@@ -333,7 +333,7 @@ class GMLAN_RDBPIPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_RDBPI and \
+        return isinstance(other, GMLAN_RDBPI) and \
             self.parameterIdentifier in other.identifiers
 
 
@@ -400,7 +400,7 @@ class GMLAN_RMBAPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_RMBA and \
+        return isinstance(other, GMLAN_RMBA) and \
             other.memoryAddress == self.memoryAddress
 
 
@@ -444,7 +444,7 @@ class GMLAN_SAPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_SA \
+        return isinstance(other, GMLAN_SA) \
             and other.subfunction == self.subfunction
 
 
@@ -470,7 +470,7 @@ class GMLAN_DDMPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_DDM \
+        return isinstance(other, GMLAN_DDM) \
             and other.DPIDIdentifier == self.DPIDIdentifier
 
 
@@ -506,7 +506,7 @@ class GMLAN_DPBAPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_DPBA \
+        return isinstance(other, GMLAN_DPBA) \
             and other.parameterIdentifier == self.parameterIdentifier
 
 
@@ -579,7 +579,7 @@ class GMLAN_WDBIPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_WDBI \
+        return isinstance(other, GMLAN_WDBI) \
             and other.dataIdentifier == self.dataIdentifier
 
 
@@ -693,7 +693,7 @@ class GMLAN_DCPR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == GMLAN_DC \
+        return isinstance(other, GMLAN_DC) \
             and other.CPIDNumber == self.CPIDNumber
 
 

scapy/contrib/automotive/obd/iid/iids.py

@@ -30,7 +30,7 @@ class OBD_S09_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S09 \
+        return isinstance(other, OBD_S09) \
             and all(r.iid in other.iid for r in self.data_records)
 
 

scapy/contrib/automotive/obd/mid/mids.py

@@ -461,7 +461,7 @@ class OBD_S06_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S06 \
+        return isinstance(other, OBD_S06) \
             and all(r.mid in other.mid for r in self.data_records)
 
 

scapy/contrib/automotive/obd/pid/pids.py

@@ -31,7 +31,7 @@ class OBD_S01_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S01 \
+        return isinstance(other, OBD_S01) \
             and all(r.pid in other.pid for r in self.data_records)
 
 
@@ -49,7 +49,7 @@ class OBD_S02_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S02 \
+        return isinstance(other, OBD_S02) \
             and all(r.pid in [o.pid for o in other.requests]
                     for r in self.data_records)
 

scapy/contrib/automotive/obd/services.py

@@ -88,7 +88,7 @@ class OBD_S03_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S03
+        return isinstance(other, OBD_S03)
 
 
 class OBD_S04(Packet):
@@ -99,7 +99,7 @@ class OBD_S04_PR(Packet):
     name = "S4_ClearDTCsPositiveResponse"
 
     def answers(self, other):
-        return other.__class__ == OBD_S04
+        return isinstance(other, OBD_S04)
 
 
 class OBD_S06(Packet):
@@ -121,7 +121,7 @@ class OBD_S07_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S07
+        return isinstance(other, OBD_S07)
 
 
 class OBD_S08(Packet):
@@ -150,4 +150,4 @@ class OBD_S0A_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S0A
+        return isinstance(other, OBD_S0A)

scapy/contrib/automotive/obd/tid/tids.py

@@ -136,7 +136,7 @@ class OBD_S08_PR(Packet):
     ]
 
     def answers(self, other):
-        return other.__class__ == OBD_S08 \
+        return isinstance(other, OBD_S08) \
             and all(r.tid in other.tid for r in self.data_records)
 
 

scapy/contrib/automotive/someip.py

@@ -144,7 +144,7 @@ def post_build(self, pkt, pay):
         return pkt + pay
 
     def answers(self, other):
-        if other.__class__ == self.__class__:
+        if isinstance(other, type(self)):
             if self.msg_type in [SOMEIP.TYPE_REQUEST_NO_RET,
                                  SOMEIP.TYPE_REQUEST_NORET_ACK,
                                  SOMEIP.TYPE_NOTIFICATION,