diff --git a/scapy/dadict.py b/scapy/dadict.py index 2f1cee20bd021a6e7ba192ff0b98f423c9f16b46..ea637e46e137f1fc2d3c3190dc7e3cd3b9289d11 100644 --- a/scapy/dadict.py +++ b/scapy/dadict.py @@ -1,4 +1,4 @@ -from scapy.error import Scapy_Exception +from error import Scapy_Exception ############################### ## Direct Access dictionnary ## diff --git a/scapy/main.py b/scapy/main.py index fbcc32f5d1ca7e27a429ab9450206ba5b5f854d0..7c2bf177a4352dc27cc51af72e094563b849cf6f 100644 --- a/scapy/main.py +++ b/scapy/main.py @@ -105,11 +105,11 @@ def interact(mydict=None,argv=None,mybanner=None,loglevel=1): 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","asn1fields","asn1packet" ]: - mod = __import__("scapy."+m,globals(),locals(),".") + mod = __import__(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", "skinny","smb","rtp","tftp","snmp","x509" ]: # "ir","bluetooth","hsrp","gprs" - mod = __import__("scapy.layers."+m,globals(),locals(),".") + mod = __import__("layers."+m,globals(),locals(),".") scapy_builtins.update(mod.__dict__) __builtin__.__dict__.update(scapy_builtins) globkeys = scapy_builtins.keys()