From 1ca24fcf3c4e53d449753824da0215d6b7968bdd Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Mon, 25 Sep 2017 14:01:05 +0200
Subject: [PATCH] .getlayer(): use super() calls
---
scapy/contrib/bgp.py | 4 +++-
scapy/layers/eap.py | 2 +-
scapy/layers/ntp.py | 2 +-
scapy/layers/radius.py | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/scapy/contrib/bgp.py b/scapy/contrib/bgp.py
index 48fcace7..1f8a9f21 100644
--- a/scapy/contrib/bgp.py
+++ b/scapy/contrib/bgp.py
@@ -627,7 +627,9 @@ class BGPCapability(six.with_metaclass(_BGPCapability_metaclass, Packet)):
for fldname, fldvalue in flt.iteritems()):
return self
else:
- return Packet.getlayer(self, cls, nb, _track, **flt)
+ return super(BGPCapability, self).getlayer(
+ cls, nb=nb, _track=_track, **flt
+ )
def post_build(self, p, pay):
length = 0
diff --git a/scapy/layers/eap.py b/scapy/layers/eap.py
index d86b78a1..0213d2ff 100644
--- a/scapy/layers/eap.py
+++ b/scapy/layers/eap.py
@@ -256,7 +256,7 @@ class EAP(Packet):
for fldname, fldvalue in flt.iteritems()):
return self
else:
- return Packet.getlayer(self, cls, nb, _track, **flt)
+ return super(EAP, self).getlayer(cls, nb=nb, _track=_track, **flt)
def answers(self, other):
if isinstance(other, EAP):
diff --git a/scapy/layers/ntp.py b/scapy/layers/ntp.py
index a9512d5f..5a72a9de 100644
--- a/scapy/layers/ntp.py
+++ b/scapy/layers/ntp.py
@@ -268,7 +268,7 @@ class NTP(Packet):
for fldname, fldvalue in flt.iteritems()):
return self
else:
- return Packet.getlayer(self, cls, nb, _track, **flt)
+ return super(NTP, self).getlayer(cls, nb=nb, _track=_track, **flt)
def mysummary(self):
return self.sprintf("NTP v%ir,NTP.version%, %NTP.mode%")
diff --git a/scapy/layers/radius.py b/scapy/layers/radius.py
index 118233c3..7fa569d5 100644
--- a/scapy/layers/radius.py
+++ b/scapy/layers/radius.py
@@ -286,7 +286,9 @@ class RadiusAttribute(Packet):
for fldname, fldvalue in flt.iteritems()):
return self
else:
- return Packet.getlayer(self, cls, nb, _track, **flt)
+ return super(RadiusAttribute, self).getlayer(
+ cls, nb=nb, _track=_track, **flt
+ )
def post_build(self, p, pay):
length = self.len
--
GitLab