From 20feccbcae636b00f74e70bd26e07562d5548f0f Mon Sep 17 00:00:00 2001
From: Phil <phil@secdev.org>
Date: Tue, 1 Jul 2008 15:29:45 +0200
Subject: [PATCH] Moved core asn1 logic to asn1 subpackage
--HG--
rename : scapy/asn1.py => scapy/asn1/asn1.py
rename : scapy/ber.py => scapy/asn1/ber.py
rename : scapy/mib.py => scapy/asn1/mib.py
---
scapy/asn1/__init__.py | 3 +++
scapy/{ => asn1}/asn1.py | 6 +++---
scapy/{ => asn1}/ber.py | 0
scapy/{ => asn1}/mib.py | 4 ++--
scapy/asn1fields.py | 4 ++--
5 files changed, 10 insertions(+), 7 deletions(-)
create mode 100644 scapy/asn1/__init__.py
rename scapy/{ => asn1}/asn1.py (98%)
rename scapy/{ => asn1}/ber.py (100%)
rename scapy/{ => asn1}/mib.py (98%)
diff --git a/scapy/asn1/__init__.py b/scapy/asn1/__init__.py
new file mode 100644
index 00000000..095a1d51
--- /dev/null
+++ b/scapy/asn1/__init__.py
@@ -0,0 +1,3 @@
+# We do not import mib.py because it is more bound to scapy and
+# less prone to be used in a standalone fashion
+__all__ = ["asn1","ber"]
diff --git a/scapy/asn1.py b/scapy/asn1/asn1.py
similarity index 98%
rename from scapy/asn1.py
rename to scapy/asn1/asn1.py
index 456f1eaa..40bc88c9 100644
--- a/scapy/asn1.py
+++ b/scapy/asn1/asn1.py
@@ -1,7 +1,7 @@
import random
-from error import Scapy_Exception
-from volatile import RandField
-from utils import Enum_metaclass, EnumElement
+from scapy.error import Scapy_Exception
+from scapy.volatile import RandField
+from scapy.utils import Enum_metaclass, EnumElement
class RandASN1Object(RandField):
def __init__(self, objlist=None):
diff --git a/scapy/ber.py b/scapy/asn1/ber.py
similarity index 100%
rename from scapy/ber.py
rename to scapy/asn1/ber.py
diff --git a/scapy/mib.py b/scapy/asn1/mib.py
similarity index 98%
rename from scapy/mib.py
rename to scapy/asn1/mib.py
index 3e5d7d73..d8717716 100644
--- a/scapy/mib.py
+++ b/scapy/asn1/mib.py
@@ -1,7 +1,7 @@
import re
from glob import glob
-from dadict import DADict
-from config import conf
+from scapy.dadict import DADict
+from scapy.config import conf
#################
## MIB parsing ##
diff --git a/scapy/asn1fields.py b/scapy/asn1fields.py
index 110e285d..01d16879 100644
--- a/scapy/asn1fields.py
+++ b/scapy/asn1fields.py
@@ -1,5 +1,5 @@
-from asn1 import *
-from ber import *
+from asn1.asn1 import *
+from asn1.ber import *
from volatile import *
#####################
--
GitLab