Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from p-l-/fix-unneeded-tests 

Remove unneeded tests
This commit is contained in:
Guillaume Valadon 2016-02-27 10:23:13 +01:00
parent 1fba9a9f43 0dc004492f
commit 363500b860
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scapy/packet.py
View File

@ -184,12 +184,10 @@ class Packet(BasePacket):
return self.payload.getfield_and_val(attr) return self.payload.getfield_and_val(attr)
def __getattr__(self, attr): def __getattr__(self, attr):
if isinstance(self, Packet): fld,v = self.getfield_and_val(attr)
fld,v = self.getfield_and_val(attr) if fld is not None:
if fld is not None: return fld.i2h(self, v)
return fld.i2h(self, v) return v
return v
raise AttributeError(attr)
def setfieldval(self, attr, val): def setfieldval(self, attr, val):
if self.default_fields.has_key(attr): if self.default_fields.has_key(attr):
@ -209,13 +207,12 @@ class Packet(BasePacket):
self.payload.setfieldval(attr,val) self.payload.setfieldval(attr,val)
def __setattr__(self, attr, val): def __setattr__(self, attr, val):
if isinstance(self, Packet): if attr in self.__all_slots__:
if attr in self.__all_slots__: return object.__setattr__(self, attr, val)
return object.__setattr__(self, attr, val) try:
try: return self.setfieldval(attr,val)
return self.setfieldval(attr,val) except AttributeError:
except AttributeError: pass
pass
return object.__setattr__(self, attr, val) return object.__setattr__(self, attr, val)
def delfieldval(self, attr): def delfieldval(self, attr):
@ -232,15 +229,14 @@ class Packet(BasePacket):
self.payload.delfieldval(attr) self.payload.delfieldval(attr)
def __delattr__(self, attr): def __delattr__(self, attr):
if isinstance(self, Packet): if attr == "payload":
if attr == "payload": return self.remove_payload()
return self.remove_payload() if attr in self.__all_slots__:
if attr in self.__all_slots__: return object.__delattr__(self, attr)
return object.__delattr__(self, attr) try:
try: return self.delfieldval(attr)
return self.delfieldval(attr) except AttributeError:
except AttributeError: pass
pass
return object.__delattr__(self, attr) return object.__delattr__(self, attr)
def __repr__(self): def __repr__(self):