From c1cc3bd6000547e64f19a1dca03abdf39fa05ab0 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Wed, 25 Jan 2017 19:20:53 +0100
Subject: [PATCH] ls(): fix tuple values display like "ls(IP(ttl=(1,10)))"
---
scapy/packet.py | 2 +-
test/regression.uts | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/scapy/packet.py b/scapy/packet.py
index 0b211ec6..d5ff4526 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -1320,7 +1320,7 @@ def ls(obj=None, case_sensitive=False, verbose=False):
else "")
print "%-10s : %-35s =" % (f.name, class_name),
if is_pkt:
- print "%-15r" % getattr(obj,f.name),
+ print "%-15r" % (getattr(obj, f.name),),
print "(%r)" % (f.default,)
for attr in long_attrs:
print "%-15s%s" % ("", attr)
diff --git a/test/regression.uts b/test/regression.uts
index 06ec3d0f..fe8c8c57 100644
--- a/test/regression.uts
+++ b/test/regression.uts
@@ -771,6 +771,7 @@ all(x[1] == 15169 for x in ret)
= Implicit logic
~ IP TCP
a=IP(ttl=(5,10))/TCP(dport=[80,443])
+ls(a)
[p for p in a]
len(_) == 12
--
GitLab