From 5c620d0941a75b79fb16fd9b1f3957ba0e553f03 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Thu, 24 Aug 2017 16:00:59 +0200
Subject: [PATCH] Use explicit bytes() for Python 3
---
scapy/layers/l2.py | 2 +-
scapy/plist.py | 2 +-
scapy/sendrecv.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scapy/layers/l2.py b/scapy/layers/l2.py
index 5e7e7978..ae6dc5c0 100644
--- a/scapy/layers/l2.py
+++ b/scapy/layers/l2.py
@@ -468,7 +468,7 @@ arpcachepoison(target, victim, [interval=60]) -> None
while True:
sendp(p, iface_hint=target)
if conf.verb > 1:
- os.write(1,".")
+ os.write(1, b".")
time.sleep(interval)
except KeyboardInterrupt:
pass
diff --git a/scapy/plist.py b/scapy/plist.py
index a066f490..3301ed03 100644
--- a/scapy/plist.py
+++ b/scapy/plist.py
@@ -416,7 +416,7 @@ lfilter: truth function to apply to each packet to decide whether it will be dis
cbb = c.bbox()
c.text(cbb.left(),cbb.top()+1,r"\font\cmssfont=cmss12\cmssfont{Frame %i/%i}" % (i,l),[pyx.text.size.LARGE])
if conf.verb >= 2:
- os.write(1,".")
+ os.write(1, b".")
d.append(pyx.document.page(c, paperformat=pyx.document.paperformat.A4,
margin=1*pyx.unit.t_cm,
fittosize=1))
diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
index 6f929646..699221ab 100644
--- a/scapy/sendrecv.py
+++ b/scapy/sendrecv.py
@@ -153,7 +153,7 @@ def sndrcv(pks, pkt, timeout=None, inter=0, verbose=None, chainCC=False,
if r.answers(sentpkt):
ans.append((sentpkt, r))
if verbose > 1:
- os.write(1, "*")
+ os.write(1, b"*")
ok = 1
if not multi:
del hlst[i]
@@ -167,7 +167,7 @@ def sndrcv(pks, pkt, timeout=None, inter=0, verbose=None, chainCC=False,
break
if not ok:
if verbose > 1:
- os.write(1, ".")
+ os.write(1, b".")
nbrecv += 1
if conf.debug_match:
debug.recv.append(r)
--
GitLab