diff --git a/scapy/fields.py b/scapy/fields.py index 345b3b9e3ce712aced532c7de46ef52955a5921d..796f858ce062d23414a538ea77ce85b7d8e160a5 100644 --- a/scapy/fields.py +++ b/scapy/fields.py @@ -1057,6 +1057,7 @@ class FlagValue(object): return self.value >> self._fixvalue(other) def __nonzero__(self): return bool(self.value) + __bool__ = __nonzero__ def flagrepr(self): i = 0 r = [] diff --git a/scapy/packet.py b/scapy/packet.py index fb65a8497a9de6935a8323a28c40cec30354b9f2..612bf31c2db801d3dbe86813253f3e2bb3b494ce 100644 --- a/scapy/packet.py +++ b/scapy/packet.py @@ -338,6 +338,7 @@ class Packet(six.with_metaclass(Packet_metaclass, BasePacket)): def __nonzero__(self): return True + __bool__ = __nonzero__ def __len__(self): return len(self.__str__()) def copy_field_value(self, fieldname, value): @@ -1222,6 +1223,7 @@ class NoPayload(Packet): return "" def __nonzero__(self): return False + __bool__ = __nonzero__ def do_build(self): return "" def build(self): diff --git a/scapy/tools/UTscapy.py b/scapy/tools/UTscapy.py index 1e4c4331ab36df6fae87ada46ee3b77ef3f6bcda..cf93c1c6575af4dcaee783859c64427b824ffe1a 100755 --- a/scapy/tools/UTscapy.py +++ b/scapy/tools/UTscapy.py @@ -194,6 +194,7 @@ class UnitTest(TestClass): self.result = self.result.decode("utf8", "ignore") def __nonzero__(self): return self.res + __bool__ = __nonzero__ # Careful note: all data not included will be set by default.