bundle bottle library in sqlmap (it is MIT license) - issue #297

_sqlmap.py

@@ -45,15 +45,9 @@ from lib.core.settings import XMLRPC_SERVER_PORT
 from lib.core.testing import smokeTest
 from lib.core.testing import liveTest
 from lib.parse.cmdline import cmdLineParser
+from lib.utils.restapi import restAPIrun
 from lib.utils.xmlrpc import XMLRPCServer
 
-try:
-    from lib.utils.restapi import restAPIrun
-except SqlmapMissingDependence, e:
-    e = getUnicode(e)
-    logger.critical(e)
-    sys.exit(1)
-
 def modulePath():
     """
     This will get us the program's directory, even if we are frozen

extra/bottle/__init__.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+"""
+Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
+See the file 'doc/COPYING' for copying permission
+"""
+
+pass

lib/utils/restapi.py

@@ -9,6 +9,7 @@ import sys
 import json
 import os
 
+from extra.bottle.bottle import abort, error, get, post, request, run, template, debug
 from lib.controller.controller import start
 from lib.core.convert import hexencode
 from lib.core.datatype import AttribDict
@@ -20,13 +21,6 @@ from lib.core.option import init
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.settings import RESTAPI_SERVER_PORT
 
-try:
-    from bottle import abort, error, get, post, request, run, template, debug
-except ImportError:
-    errMsg = "Missing mandatory library bottle: download from "
-    errMsg += "http://bottlepy.org/ and install it"
-    raise SqlmapMissingDependence, errMsg
-
 
 # local global variables
 session_ids = []