From 0dc004492f143ce16a2c43675e6ea318b8f51be5 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Fri, 26 Feb 2016 23:48:34 +0100
Subject: [PATCH] Remove unneeded tests
Reported by Aaron Wood on Scapy ML.
---
scapy/packet.py | 40 ++++++++++++++++++----------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/scapy/packet.py b/scapy/packet.py
index 1e10df3e..877ea948 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -184,12 +184,10 @@ class Packet(BasePacket):
return self.payload.getfield_and_val(attr)
def __getattr__(self, attr):
- if isinstance(self, Packet):
- fld,v = self.getfield_and_val(attr)
- if fld is not None:
- return fld.i2h(self, v)
- return v
- raise AttributeError(attr)
+ fld,v = self.getfield_and_val(attr)
+ if fld is not None:
+ return fld.i2h(self, v)
+ return v
def setfieldval(self, attr, val):
if self.default_fields.has_key(attr):
@@ -209,13 +207,12 @@ class Packet(BasePacket):
self.payload.setfieldval(attr,val)
def __setattr__(self, attr, val):
- if isinstance(self, Packet):
- if attr in self.__all_slots__:
- return object.__setattr__(self, attr, val)
- try:
- return self.setfieldval(attr,val)
- except AttributeError:
- pass
+ if attr in self.__all_slots__:
+ return object.__setattr__(self, attr, val)
+ try:
+ return self.setfieldval(attr,val)
+ except AttributeError:
+ pass
return object.__setattr__(self, attr, val)
def delfieldval(self, attr):
@@ -232,15 +229,14 @@ class Packet(BasePacket):
self.payload.delfieldval(attr)
def __delattr__(self, attr):
- if isinstance(self, Packet):
- if attr == "payload":
- return self.remove_payload()
- if attr in self.__all_slots__:
- return object.__delattr__(self, attr)
- try:
- return self.delfieldval(attr)
- except AttributeError:
- pass
+ if attr == "payload":
+ return self.remove_payload()
+ if attr in self.__all_slots__:
+ return object.__delattr__(self, attr)
+ try:
+ return self.delfieldval(attr)
+ except AttributeError:
+ pass
return object.__delattr__(self, attr)
def __repr__(self):
--
GitLab