cleaner solution for imports as standalone client/server (issue #297)

sqlmapproject · Dec 14, 2012 · 7b43837 · 7b43837
1 parent 90d5696
commit 7b43837
Showing 1 changed file with 23 additions and 33 deletions.
diff --git a/lib/utils/restapi.py b/lib/utils/restapi.py
@@ -14,39 +14,29 @@
 except ImportError:
     import json
 
-try:
-    from extra.bottle.bottle import abort
-    from extra.bottle.bottle import debug
-    from extra.bottle.bottle import error
-    from extra.bottle.bottle import get
-    from extra.bottle.bottle import post
-    from extra.bottle.bottle import request
-    from extra.bottle.bottle import response
-    from extra.bottle.bottle import Response
-    from extra.bottle.bottle import run
-    from extra.bottle.bottle import static_file
-    from extra.bottle.bottle import template
-except ImportError:
-    try:
-        from bottle import *
-    except ImportError, e:
-        print "[x] '%s'" % str(e)
-        sys.exit(1)
-
-try:
-    sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", ".."))
-    from lib.controller.controller import start
-    from lib.core.convert import hexencode
-    from lib.core.datatype import AttribDict
-    from lib.core.data import cmdLineOptions
-    from lib.core.data import kb
-    from lib.core.data import logger
-    from lib.core.exception import SqlmapMissingDependence
-    from lib.core.option import init
-    from lib.core.settings import UNICODE_ENCODING
-    from lib.core.settings import RESTAPI_SERVER_PORT
-except ImportError:
-    RESTAPI_SERVER_PORT = 8775
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", ".."))
+
+from extra.bottle.bottle import abort
+from extra.bottle.bottle import debug
+from extra.bottle.bottle import error
+from extra.bottle.bottle import get
+from extra.bottle.bottle import post
+from extra.bottle.bottle import request
+from extra.bottle.bottle import response
+from extra.bottle.bottle import Response
+from extra.bottle.bottle import run
+from extra.bottle.bottle import static_file
+from extra.bottle.bottle import template
+from lib.controller.controller import start
+from lib.core.convert import hexencode
+from lib.core.datatype import AttribDict
+from lib.core.data import cmdLineOptions
+from lib.core.data import kb
+from lib.core.data import logger
+from lib.core.exception import SqlmapMissingDependence
+from lib.core.option import init
+from lib.core.settings import UNICODE_ENCODING
+from lib.core.settings import RESTAPI_SERVER_PORT
 
 # local global variables
 session_ids = []