More work for Issue #66

lib/core/common.py

@@ -42,13 +42,8 @@ from xml.etree import ElementTree as ET
 from xml.dom import minidom
 from xml.sax import parse
 
-from extra.clientform.clientform import ParseResponse
-from extra.clientform.clientform import ParseError
 from extra.cloak.cloak import decloak
-from extra.magic import magic
-from extra.odict.odict import OrderedDict
 from extra.safe2bin.safe2bin import safecharencode
-from extra.termcolor.termcolor import colored
 from lib.core.bigarray import BigArray
 from lib.core.data import conf
 from lib.core.data import kb
@@ -130,6 +125,11 @@ from lib.core.settings import TEXT_TAG_REGEX
 from lib.core.settings import UNION_UNIQUE_FIFO_LENGTH
 from lib.core.settings import URI_QUESTION_MARKER
 from lib.core.threads import getCurrentThreadData
+from thirdparty.clientform.clientform import ParseResponse
+from thirdparty.clientform.clientform import ParseError
+from thirdparty.magic import magic
+from thirdparty.odict.odict import OrderedDict
+from thirdparty.termcolor.termcolor import colored
 
 class UnicodeRawConfigParser(RawConfigParser):
     """

lib/core/log.py

@@ -8,8 +8,8 @@ See the file 'doc/COPYING' for copying permission
 import logging
 import sys
 
-from extra.ansistrm.ansistrm import ColorizingStreamHandler
 from lib.core.enums import CUSTOM_LOGGING
+from thirdparty.ansistrm.ansistrm import ColorizingStreamHandler
 
 logging.addLevelName(CUSTOM_LOGGING.PAYLOAD, "PAYLOAD")
 logging.addLevelName(CUSTOM_LOGGING.TRAFFIC_OUT, "TRAFFIC OUT")

lib/core/option.py

@@ -20,10 +20,6 @@ import urlparse
 import lib.core.common
 import lib.core.threads
 
-from extra.colorama.initialise import init as coloramainit
-from extra.keepalive import keepalive
-from extra.oset.pyoset import oset
-from extra.socks import socks
 from lib.controller.checks import checkConnection
 from lib.core.common import Backend
 from lib.core.common import boldifyMessage
@@ -130,6 +126,10 @@ from lib.request.templates import getPageTemplate
 from lib.utils.crawler import Crawler
 from lib.utils.deps import checkDependencies
 from lib.utils.google import Google
+from thirdparty.colorama.initialise import init as coloramainit
+from thirdparty.keepalive import keepalive
+from thirdparty.oset.pyoset import oset
+from thirdparty.socks import socks
 from xml.etree.ElementTree import ElementTree
 
 authHandler = urllib2.BaseHandler()

lib/core/profiling.py

@@ -20,8 +20,8 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
     """
 
     try:
-        from extra.gprof2dot import gprof2dot
-        from extra.xdot import xdot
+        from thirdparty.gprof2dot import gprof2dot
+        from thirdparty.xdot import xdot
         import gobject
         import gtk
         import pydot

lib/core/xmldump.py

@@ -7,16 +7,15 @@ import xml
 
 import xml.sax.saxutils as saxutils
 
-from xml.dom.minidom import Document
-from xml.parsers.expat import ExpatError
-
-from extra.prettyprint import prettyprint
 from lib.core.common import getUnicode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.exception import sqlmapFilePathException
 from lib.core.settings import UNICODE_ENCODING
+from thirdparty.prettyprint import prettyprint
+from xml.dom.minidom import Document
+from xml.parsers.expat import ExpatError
 
 TECHNIC_ELEM_NAME = "Technic"
 TECHNICS_ELEM_NAME = "Technics"