From 76ba571237d688c28d3d9ea8eb0b7552381c226d Mon Sep 17 00:00:00 2001
From: gpotter2 <gabriel@potter.fr>
Date: Tue, 27 Jun 2017 14:35:11 +0200
Subject: [PATCH] Add __bool__ as __nonzero__ alias
---
scapy/fields.py | 1 +
scapy/packet.py | 2 ++
scapy/tools/UTscapy.py | 1 +
3 files changed, 4 insertions(+)
diff --git a/scapy/fields.py b/scapy/fields.py
index 345b3b9e..796f858c 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 fb65a849..612bf31c 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 1e4c4331..cf93c1c6 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.
--
GitLab