From 0cd950d482733033195e410eb3069f97f1641451 Mon Sep 17 00:00:00 2001
From: Phil <phil@secdev.org>
Date: Mon, 23 Jun 2008 14:51:54 +0200
Subject: [PATCH] Made imports be relative
---
scapy/dadict.py | 2 +-
scapy/main.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scapy/dadict.py b/scapy/dadict.py
index 2f1cee20..ea637e46 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 fbcc32f5..7c2bf177 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()
--
GitLab