Skip to content

Commit

Permalink
Merge pull request #293 from 6WIND/windows-arch-bugfix
Browse files Browse the repository at this point in the history
arch/windows: fix circular import
  • Loading branch information
p-l- committed Sep 26, 2016
2 parents 5c74229 + a300eac commit 3d02771
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scapy/arch/windows/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from scapy.utils import atol, itom, inet_aton, inet_ntoa, PcapReader
from scapy.base_classes import Gen, Net, SetGen
import scapy.plist as plist
from scapy.sendrecv import debug, srp1
from scapy.data import MTU, ETHER_BROADCAST, ETH_P_ARP

conf.use_pcap = False
Expand Down Expand Up @@ -461,6 +460,7 @@ def sndrcv(pks, pkt, timeout = 2, inter = 0, verbose=None, chainCC=0, retry=0, m

if verbose is None:
verbose = conf.verb
from scapy.sendrecv import debug
debug.recv = plist.PacketList([],"Unanswered")
debug.sent = plist.PacketList([],"Sent")
debug.match = plist.SndRcvList([])
Expand Down

0 comments on commit 3d02771

Please sign in to comment.