[tor-commits] [ooni-probe/master] Avoid doing wildcard import of scapy.all

[art at torproject.org]

commit 2916d809b933263bece9ee4e33f4bf7e868c759e
Author: Arturo Filastò <arturo at filasto.net>
Date:   Wed Oct 24 16:17:19 2012 +0000

    Avoid doing wildcard import of scapy.all
    * Your code has been rated at 5.68/10 (previous run: 5.63/10)
---
 ooni/protocols/daphn3.py |    2 +-
 ooni/templates/scapyt.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/protocols/daphn3.py b/ooni/protocols/daphn3.py
index a4cc32a..37c94c7 100644
--- a/ooni/protocols/daphn3.py
+++ b/ooni/protocols/daphn3.py
@@ -4,7 +4,7 @@ import yaml
 from twisted.internet import protocol, defer
 from twisted.internet.error import ConnectionDone
 
-from scapy.all import *
+from scapy.all import IP, Raw, rdpcap
 
 from ooni.utils import log
 from ooni.plugoo import reports
diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py
index b2ac148..c0fca0c 100644
--- a/ooni/templates/scapyt.py
+++ b/ooni/templates/scapyt.py
@@ -9,7 +9,7 @@ from twisted.python import usage
 from twisted.plugin import IPlugin
 from twisted.internet import protocol, defer
 
-from scapy.all import *
+from scapy.all import IP, TCP
 
 from ooni.nettest import TestCase
 from ooni.utils import log