From 33ea811c6c5bacbb4207b3c9986d03cfb9ac6b5d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 18 Jan 2013 11:50:02 +0100 Subject: [PATCH] Removing some unused stuff (mainly imports) --- lib/core/convert.py | 7 ------- lib/core/exception.py | 3 --- lib/core/option.py | 1 - lib/core/subprocessng.py | 1 - lib/utils/api.py | 11 ----------- 5 files changed, 23 deletions(-) diff --git a/lib/core/convert.py b/lib/core/convert.py index 48c904e9e..c3446cc14 100644 --- a/lib/core/convert.py +++ b/lib/core/convert.py @@ -5,16 +5,9 @@ Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/) See the file 'doc/COPYING' for copying permission """ -try: - import hashlib -except: - import md5 - import sha - import json import pickle import sys -import struct from lib.core.settings import IS_WIN from lib.core.settings import UNICODE_ENCODING diff --git a/lib/core/exception.py b/lib/core/exception.py index 37ba1999d..39d0c13f7 100644 --- a/lib/core/exception.py +++ b/lib/core/exception.py @@ -44,9 +44,6 @@ class SqlmapSilentQuitException(SqlmapBaseException): class SqlmapUserQuitException(SqlmapBaseException): pass -class SqlmapRegExprException(SqlmapBaseException): - pass - class SqlmapSyntaxException(SqlmapBaseException): pass diff --git a/lib/core/option.py b/lib/core/option.py index f71ea9b6b..35d25ba26 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -111,7 +111,6 @@ from lib.core.settings import NULL from lib.core.settings import ORACLE_ALIASES from lib.core.settings import PARAMETER_SPLITTING_REGEX from lib.core.settings import PGSQL_ALIASES -from lib.core.settings import PYVERSION from lib.core.settings import SITE from lib.core.settings import SQLITE_ALIASES from lib.core.settings import SUPPORTED_DBMS diff --git a/lib/core/subprocessng.py b/lib/core/subprocessng.py index 717b52190..0d7f78a17 100644 --- a/lib/core/subprocessng.py +++ b/lib/core/subprocessng.py @@ -11,7 +11,6 @@ import subprocess import sys import time -from lib.core.common import dataToStdout from lib.core.settings import IS_WIN if IS_WIN: diff --git a/lib/utils/api.py b/lib/utils/api.py index 4f45c3f27..59c578d3e 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -5,32 +5,22 @@ Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/) See the file 'doc/COPYING' for copying permission """ -import json -import logging import os import shutil -import sys import tempfile -import types from subprocess import PIPE -from lib.controller.controller import start from lib.core.common import unArrayizeValue from lib.core.convert import base64pickle from lib.core.convert import base64unpickle from lib.core.convert import hexencode from lib.core.convert import jsonize -from lib.core.convert import stdoutencode from lib.core.data import paths -from lib.core.data import kb from lib.core.data import logger from lib.core.datatype import AttribDict from lib.core.defaults import _defaults -from lib.core.exception import SqlmapMissingDependence from lib.core.optiondict import optDict -from lib.core.option import init -from lib.core.settings import UNICODE_ENCODING from lib.core.subprocessng import Popen as execute from lib.core.subprocessng import send_all from lib.core.subprocessng import recv_some @@ -43,7 +33,6 @@ from thirdparty.bottle.bottle import request from thirdparty.bottle.bottle import response from thirdparty.bottle.bottle import run from thirdparty.bottle.bottle import static_file -from thirdparty.bottle.bottle import template RESTAPI_SERVER_HOST = "127.0.0.1" RESTAPI_SERVER_PORT = 8775