From 3dfad350e34f8038e59497c356b9519054a2c5aa Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Wed, 25 Jan 2017 19:11:56 +0100
Subject: [PATCH] ls(): fix flags display when verbose=1
---
scapy/packet.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/scapy/packet.py b/scapy/packet.py
index 9a6d73ec..8d5bbc75 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -1309,10 +1309,7 @@ def ls(obj=None, case_sensitive=False, verbose=False):
)
elif verbose and isinstance(cur_fld, FlagsField):
names = cur_fld.names
- if isinstance(names, basestring):
- long_attrs.append(", ".join(names))
- else:
- long_attrs.append(", ".join(name[0] for name in names))
+ long_attrs.append(", ".join(names))
class_name = "%s (%s)" % (
cur_fld.__class__.__name__,
", ".join(attrs)) if attrs else cur_fld.__class__.__name__
--
GitLab