commit a68176f803f56ead0e73ba8aac052e2886b6f2ef
author Rich Lane <rlane@bigswitch.com> Fri Aug 09 17:41:05 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Fri Aug 09 17:41:05 2013 -0700
tree 1485cfa1a449c1c868ec0340e3c14d1ecbcc319e
parent 2855ef7187e9b2ebd3d2b1b2240aebb277ee1bff

wrap scapy with explicit imports

pylint can't handle scapy's magical imports.

src/python/oftest/testutils.py

diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index e87b7a0..26c25d3 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -4,14 +4,7 @@
 import types
 import time
 import re
-
-try:
-    import scapy.all as scapy
-except:
-    try:
-        import scapy as scapy
-    except:
-        sys.exit("Need to install scapy for packet parsing")
+import packet as scapy
 
 import oftest
 import oftest.controller