From 1913c7cf573899fec5f12c62b1f4ad2039bf0319 Mon Sep 17 00:00:00 2001
From: Phil <phil@secdev.org>
Date: Fri, 23 May 2008 13:20:43 +0200
Subject: [PATCH] Small fixes in imports
---
scapy/layers/inet.py | 4 ++--
scapy/main.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scapy/layers/inet.py b/scapy/layers/inet.py
index 98f47d8e..d8b6d099 100644
--- a/scapy/layers/inet.py
+++ b/scapy/layers/inet.py
@@ -4,8 +4,8 @@ from select import select
from scapy.layers.l2 import *
from scapy.fields import *
from scapy.volatile import *
-from config import conf
-from sendrecv import sr,sr1
+from scapy.config import conf
+from scapy.sendrecv import sr,sr1
diff --git a/scapy/main.py b/scapy/main.py
index 86de2d2c..71ab1dc2 100644
--- a/scapy/main.py
+++ b/scapy/main.py
@@ -106,7 +106,7 @@ def interact(mydict=None,argv=None,mybanner=None,loglevel=1):
import __builtin__
scapy_builtins = {}
for m in [ "ansmachine","arch","automaton","autorun","config","dadict","data","error","fields","main",
- "mib","packet","plist","route","sendrecv","supersocket","themes","utils","volatile","asn1","asn1f" ]:
+ "mib","packet","plist","route","sendrecv","supersocket","themes","utils","volatile","asn1","asn1fields","asn1packet" ]:
mod = __import__("scapy."+m,globals(),locals(),".")
scapy_builtins.update(mod.__dict__)
for m in ["l2","inet","dot11","dhcp","dns","ip6","isakmp","l2tp","mgcp","netbios","ntp","ppp","radius","rip",
--
GitLab