From 5531c34679ec024f147bc93fdff100ae44100bdf Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Wed, 25 Jan 2017 19:12:28 +0100
Subject: [PATCH] ls(): do not display "Emph" for Emph fields
---
scapy/packet.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scapy/packet.py b/scapy/packet.py
index 8d5bbc75..0b211ec6 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -1283,7 +1283,8 @@ def ls(obj=None, case_sensitive=False, verbose=False):
attrs = []
long_attrs = []
while isinstance(cur_fld, (Emph, ConditionalField)):
- attrs.append(cur_fld.__class__.__name__[:4])
+ if isinstance(cur_fld, ConditionalField):
+ attrs.append(cur_fld.__class__.__name__[:4])
cur_fld = cur_fld.fld
if verbose and isinstance(cur_fld, EnumField) \
and hasattr(cur_fld, "i2s"):
--
GitLab