removing of unused imports together with some general code refactoring

_sqlmap.py

@@ -7,7 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import codecs
 import os
 import sys
 import time

lib/controller/checks.py

@@ -8,13 +8,11 @@ See the file 'doc/COPYING' for copying permission
 """
 
 import httplib
-import logging
 import re
 import socket
 import time
 
 from lib.core.agent import agent
-from lib.core.common import aliasToDbmsEnum
 from lib.core.common import arrayizeValue
 from lib.core.common import Backend
 from lib.core.common import beep
@@ -22,7 +20,6 @@ from lib.core.common import extractRegexResult
 from lib.core.common import findDynamicContent
 from lib.core.common import Format
 from lib.core.common import getComparePageRatio
-from lib.core.common import getCompiledRegex
 from lib.core.common import getLastRequestHTTPError
 from lib.core.common import getSortedInjectionTests
 from lib.core.common import getUnicode
@@ -36,13 +33,11 @@ from lib.core.common import randomStr
 from lib.core.common import readInput
 from lib.core.common import showStaticWords
 from lib.core.common import singleTimeWarnMessage
-from lib.core.common import trimAlphaNum
 from lib.core.common import wasLastRequestDBMSError
 from lib.core.common import wasLastRequestHTTPError
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.data import paths
 from lib.core.datatype import AttribDict
 from lib.core.datatype import InjectionDict
 from lib.core.enums import HTTPHEADER
@@ -51,7 +46,6 @@ from lib.core.enums import NULLCONNECTION
 from lib.core.enums import PAYLOAD
 from lib.core.enums import PLACE
 from lib.core.exception import sqlmapConnectionException
-from lib.core.exception import sqlmapGenericException
 from lib.core.exception import sqlmapNoneDataException
 from lib.core.exception import sqlmapSilentQuitException
 from lib.core.exception import sqlmapUserQuitException
@@ -879,7 +873,7 @@ def checkWaf():
     conf.parameters[PLACE.GET] += "%s=%d %s" % (randomStr(), randomInt(), IDS_WAF_CHECK_PAYLOAD)
 
     kb.matchRatio = None
-    _ = Request.queryPage()
+    Request.queryPage()
 
     if kb.errorIsNone and kb.matchRatio is None:
         kb.matchRatio = LOWER_RATIO_BOUND

lib/controller/handler.py

@@ -11,9 +11,7 @@ from lib.core.common import Backend
 from lib.core.common import popValue
 from lib.core.common import pushValue
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.enums import DBMS
 from lib.core.settings import MSSQL_ALIASES
 from lib.core.settings import MYSQL_ALIASES
 from lib.core.settings import ORACLE_ALIASES

lib/core/agent.py

@@ -18,11 +18,9 @@ from lib.core.common import isTechniqueAvailable
 from lib.core.common import randomInt
 from lib.core.common import randomStr
 from lib.core.common import singleTimeWarnMessage
-from lib.core.convert import urlencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import queries
-from lib.core.datatype import AttribDict
 from lib.core.enums import DBMS
 from lib.core.enums import PAYLOAD
 from lib.core.enums import PLACE

lib/core/common.py

@@ -14,7 +14,6 @@ import httplib
 import inspect
 import logging
 import ntpath
-import optparse
 import os
 import pickle
 import posixpath
@@ -25,7 +24,6 @@ import string
 import struct
 import sys
 import time
-import types
 import urllib
 import urlparse
 import unicodedata
@@ -49,14 +47,13 @@ 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 lib.core.bigarray import BigArray
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import paths
-from lib.core.data import queries
 from lib.core.convert import htmlunescape
-from lib.core.convert import safecharencode
 from lib.core.convert import unicodeencode
 from lib.core.convert import urldecode
 from lib.core.convert import urlencode
@@ -120,7 +117,6 @@ from lib.core.settings import TIME_STDEV_COEFF
 from lib.core.settings import DYNAMICITY_MARK_LENGTH
 from lib.core.settings import REFLECTIVE_MISS_THRESHOLD
 from lib.core.settings import SENSITIVE_DATA_REGEX
-from lib.core.settings import SUPPORTED_OS
 from lib.core.settings import UNION_UNIQUE_FIFO_LENGTH
 from lib.core.settings import URI_INJECTION_MARK_CHAR
 from lib.core.settings import URI_QUESTION_MARKER

lib/core/convert.py

@@ -13,19 +13,14 @@ except:
     import md5
     import sha
 
-import binascii
 import pickle
 import re
 import sys
-import string
 import struct
 import urllib
 
-from extra.safe2bin.safe2bin import safecharencode
-from extra.safe2bin.safe2bin import safechardecode
 from lib.core.data import conf
 from lib.core.data import kb
-from lib.core.data import logger
 from lib.core.enums import PLACE
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.settings import URLENCODE_CHAR_LIMIT

lib/core/option.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 import codecs
 import cookielib
-import difflib
 import inspect
 import logging
 import os
@@ -44,7 +43,6 @@ from lib.core.common import parseTargetUrl
 from lib.core.common import paths
 from lib.core.common import randomRange
 from lib.core.common import randomStr
-from lib.core.common import readCachedFileContent
 from lib.core.common import readInput
 from lib.core.common import runningAsAdmin
 from lib.core.common import sanitizeStr
@@ -55,7 +53,6 @@ from lib.core.convert import urlencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.data import paths
 from lib.core.data import queries
 from lib.core.datatype import AttribDict
 from lib.core.datatype import InjectionDict
@@ -87,7 +84,6 @@ from lib.core.settings import DEFAULT_TOR_HTTP_PORTS
 from lib.core.settings import DEFAULT_TOR_SOCKS_PORT
 from lib.core.settings import IS_WIN
 from lib.core.settings import NULL
-from lib.core.settings import PLATFORM
 from lib.core.settings import PYVERSION
 from lib.core.settings import SITE
 from lib.core.settings import DBMS_DICT

lib/core/replication.py

@@ -7,8 +7,8 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
+from extra.safe2bin.safe2bin import safechardecode
 from lib.core.common import unsafeSQLIdentificatorNaming
-from lib.core.convert import safechardecode
 from lib.core.exception import sqlmapMissingDependence
 from lib.core.exception import sqlmapValueException
 
@@ -21,7 +21,7 @@ class Replication:
     def __init__(self, dbpath):
         try:
             import sqlite3
-        except ImportError, _:
+        except ImportError:
             errMsg = "missing module 'sqlite3' needed by switch '--replicate'"
             raise sqlmapMissingDependence, errMsg
 

lib/core/revision.py

@@ -23,7 +23,7 @@ def getRevisionNumber():
         client = pysvn.Client()
         if client.info(curDir):
             retVal = client.info(curDir).revision.number
-    except ImportError, _:
+    except ImportError:
         process = execute("svn info %s" % curDir, shell=True, stdout=PIPE, stderr=PIPE)
         svnStdout, svnStderr = process.communicate()
 

lib/core/session.py

@@ -12,7 +12,6 @@ import re
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.common import dataToSessionFile
-from lib.core.common import getFilteredPageContent
 from lib.core.common import intersect
 from lib.core.common import readInput
 from lib.core.common import singleTimeWarnMessage
@@ -21,12 +20,7 @@ from lib.core.convert import base64unpickle
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.datatype import InjectionDict
-from lib.core.enums import DBMS
 from lib.core.enums import OS
-from lib.core.enums import PAYLOAD
-from lib.core.enums import PLACE
-from lib.core.settings import METADB_SUFFIX
 from lib.core.settings import SUPPORTED_DBMS
 from lib.core.settings import UNKNOWN_DBMS_VERSION
 

lib/core/settings.py

@@ -15,7 +15,6 @@ import sys
 from lib.core.enums import CUSTOM_LOGGING
 from lib.core.enums import DBMS
 from lib.core.enums import DBMS_DIRECTORY_NAME
-from lib.core.enums import PLACE
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version and site

lib/core/shell.py

@@ -13,10 +13,8 @@ import rlcompleter
 
 from lib.core import readlineng as readline
 from lib.core.common import Backend
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import paths
-from lib.core.data import queries
 from lib.core.enums import OS
 
 def saveHistory():

lib/core/target.py

@@ -45,7 +45,6 @@ from lib.core.settings import URI_INJECTION_MARK_CHAR
 from lib.core.settings import USER_AGENT_ALIASES
 from lib.utils.hashdb import HashDB
 from lib.core.xmldump import dumper as xmldumper
-from lib.request.connect import Connect as Request
 
 def __setRequestParams():
     """

lib/core/testing.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 import doctest
-import logging
 import os
 import re
 import shutil

lib/core/update.py

@@ -7,14 +7,9 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import os
 import re
-import shutil
-import sys
 import time
 
-from distutils.dir_util import mkpath
-
 from subprocess import PIPE
 from subprocess import Popen as execute
 
@@ -23,11 +18,9 @@ from lib.core.common import getUnicode
 from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.data import paths
-from lib.core.exception import sqlmapFilePathException
 from lib.core.settings import IS_WIN
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.subprocessng import pollProcess
-from lib.request.connect import Connect as Request
 
 def update():
     if not conf.updateAll:

lib/parse/banner.py

@@ -7,8 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
 from xml.sax.handler import ContentHandler
 
 from lib.core.common import checkFile

lib/parse/cmdline.py

@@ -20,7 +20,6 @@ from lib.core.data import logger
 from lib.core.defaults import defaults
 from lib.core.settings import IS_WIN
 from lib.core.settings import VERSION_STRING
-from lib.core.settings import UNICODE_ENCODING
 
 def cmdLineParser():
     """
@@ -665,7 +664,7 @@ def cmdLineParser():
     except (OptionError, TypeError), e:
         parser.error(e)
 
-    except SystemExit, _:
+    except SystemExit:
         # Protection against Windows dummy double clicking
         if IS_WIN:
             print "\nPress Enter to continue...",

lib/request/basic.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 import codecs
 import gzip
 import logging
-import os
 import re
 import StringIO
 import zlib
@@ -19,8 +18,6 @@ from extra.chardet import detect
 from lib.core.common import extractErrorMessage
 from lib.core.common import extractRegexResult
 from lib.core.common import getUnicode
-from lib.core.common import isWindowsDriveLetterPath
-from lib.core.common import posixToNtSlashes
 from lib.core.common import readInput
 from lib.core.common import singleTimeLogMessage
 from lib.core.data import conf
@@ -28,12 +25,10 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import HTTPHEADER
 from lib.core.enums import PLACE
-from lib.core.exception import sqlmapDataException
 from lib.core.settings import DEFAULT_COOKIE_DELIMITER
 from lib.core.settings import ML
 from lib.core.settings import META_CHARSET_REGEX
 from lib.core.settings import PARSE_HEADERS_LIMIT
-from lib.core.settings import UNICODE_ENCODING
 from lib.parse.headers import headersParser
 from lib.parse.html import htmlParser
 

lib/request/connect.py

@@ -20,18 +20,15 @@ from extra.multipart import multipartpost
 
 from lib.core.agent import agent
 from lib.core.common import asciifyUrl
-from lib.core.common import average
 from lib.core.common import calculateDeltaSeconds
 from lib.core.common import clearConsoleLine
 from lib.core.common import cpuThrottle
 from lib.core.common import evaluateCode
 from lib.core.common import extractRegexResult
 from lib.core.common import getCurrentThreadData
-from lib.core.common import getFilteredPageContent
 from lib.core.common import getHostHeader
 from lib.core.common import getUnicode
 from lib.core.common import logHTTPTraffic
-from lib.core.common import parseTargetUrl
 from lib.core.common import randomizeParameterValue
 from lib.core.common import readInput
 from lib.core.common import removeReflectiveValues
@@ -61,7 +58,6 @@ from lib.core.settings import MIN_TIME_RESPONSES
 from lib.core.settings import WARN_TIME_STDEV
 from lib.core.settings import UNENCODED_ORIGINAL_VALUE
 from lib.core.settings import URI_HTTP_HEADER
-from lib.core.threads import getCurrentThreadData
 from lib.request.basic import decodePage
 from lib.request.basic import forgeHeaders
 from lib.request.basic import processResponse
@@ -171,7 +167,6 @@ class Connect:
         url = url.replace(" ", "%20")
 
         page = None
-        cookieStr = u""
         requestMsg = u"HTTP request [#%d]:\n%s " % (threadData.lastRequestUID, method or (HTTPMETHOD.POST if post else HTTPMETHOD.GET))
         requestMsg += "%s" % urlparse.urlsplit(url)[2] or "/"
         responseMsg = u"HTTP response "
@@ -619,7 +614,6 @@ class Connect:
             for randomParameter in conf.rParam:
                 for item in [PLACE.GET, PLACE.POST, PLACE.COOKIE]:
                     if item in conf.parameters:
-                        origValue = conf.parameters[item]
                         if item == PLACE.GET and get:
                             get = _randomizeParameter(get, randomParameter)
                         elif item == PLACE.POST and post:

lib/request/direct.py

@@ -10,14 +10,11 @@ See the file 'doc/COPYING' for copying permission
 import time
 
 from lib.core.agent import agent
-from lib.core.common import dataToSessionFile
 from lib.core.common import Backend
 from lib.core.common import calculateDeltaSeconds
 from lib.core.common import getCurrentThreadData
 from lib.core.common import getUnicode
-from lib.core.convert import base64pickle
 from lib.core.convert import base64unpickle
-from lib.core.convert import utf8decode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger

lib/takeover/abstraction.py

@@ -7,16 +7,14 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
+from extra.safe2bin.safe2bin import safechardecode
 from lib.core.common import dataToStdout
 from lib.core.common import Backend
 from lib.core.common import isTechniqueAvailable
 from lib.core.common import readInput
-from lib.core.convert import safechardecode
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
-from lib.core.enums import OS
 from lib.core.enums import PAYLOAD
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.shell import autoCompletion

lib/takeover/icmpsh.py

@@ -19,7 +19,6 @@ from lib.core.common import ntToPosixSlashes
 from lib.core.common import randomStr
 from lib.core.common import readInput
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import paths
 

lib/takeover/metasploit.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 import codecs
 import os
 import re
-import stat
 import sys
 import time
 
@@ -29,7 +28,6 @@ from lib.core.common import randomRange
 from lib.core.common import randomStr
 from lib.core.common import readInput
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.enums import DBMS
@@ -41,7 +39,6 @@ from lib.core.subprocessng import blockingReadFromFD
 from lib.core.subprocessng import blockingWriteToFD
 from lib.core.subprocessng import pollProcess
 from lib.core.subprocessng import setNonBlocking
-from lib.request.connect import Connect as Request
 
 
 class Metasploit:

lib/takeover/web.py

@@ -34,8 +34,6 @@ from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.enums import OS
 from lib.core.enums import PAYLOAD
-from lib.core.exception import sqlmapUnsupportedDBMSException
-from lib.core.shell import autoCompletion
 from lib.request.connect import Connect as Request
 
 

lib/takeover/xp_cmdshell.py

@@ -10,13 +10,11 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.common import Backend
 from lib.core.common import getSPLSnippet
 from lib.core.common import randomStr
-from lib.core.common import readCachedFileContent
 from lib.core.common import readInput
 from lib.core.common import wasLastRequestDelayed
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.data import paths
 from lib.core.enums import DBMS
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.session import setXpCmdshellAvailability

lib/techniques/blind/inference.py

@@ -9,8 +9,8 @@ See the file 'doc/COPYING' for copying permission
 
 import threading
 import time
-import traceback
 
+from extra.safe2bin.safe2bin import safecharencode
 from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import dataToStdout
@@ -22,21 +22,14 @@ from lib.core.common import getCounter
 from lib.core.common import goGoodSamaritan
 from lib.core.common import getPartRun
 from lib.core.common import incrementCounter
-from lib.core.common import popValue
-from lib.core.common import pushValue
-from lib.core.common import replaceNewlineTabs
 from lib.core.common import safeStringFormat
 from lib.core.common import singleTimeWarnMessage
-from lib.core.common import unhandledExceptionMessage
-from lib.core.convert import safecharencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.enums import DBMS
 from lib.core.enums import PAYLOAD
-from lib.core.exception import sqlmapConnectionException
-from lib.core.exception import sqlmapValueException
 from lib.core.exception import sqlmapThreadException
 from lib.core.progress import ProgressBar
 from lib.core.settings import CHAR_INFERENCE_MARK
@@ -47,7 +40,6 @@ from lib.core.settings import INFERENCE_EQUALS_CHAR
 from lib.core.settings import INFERENCE_NOT_EQUALS_CHAR
 from lib.core.settings import MAX_TIME_REVALIDATION_STEPS
 from lib.core.settings import PARTIAL_VALUE_MARKER
-from lib.core.settings import PYVERSION
 from lib.core.threads import getCurrentThreadData
 from lib.core.threads import runThreads
 from lib.core.unescaper import unescaper

lib/techniques/brute/use.py

@@ -7,7 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import threading
 import time
 
 from lib.core.common import clearConsoleLine
@@ -16,11 +15,8 @@ from lib.core.common import filterListValue
 from lib.core.common import getFileItems
 from lib.core.common import Backend
 from lib.core.common import getPageWordSet
-from lib.core.common import popValue
-from lib.core.common import pushValue
 from lib.core.common import randomInt
 from lib.core.common import randomStr
-from lib.core.common import readInput
 from lib.core.common import safeStringFormat
 from lib.core.common import safeSQLIdentificatorNaming
 from lib.core.data import conf
@@ -30,12 +26,9 @@ from lib.core.enums import DBMS
 from lib.core.enums import HASHDB_KEYS
 from lib.core.exception import sqlmapDataException
 from lib.core.exception import sqlmapMissingMandatoryOptionException
-from lib.core.exception import sqlmapThreadException
-from lib.core.settings import MAX_NUMBER_OF_THREADS
 from lib.core.settings import METADB_SUFFIX
 from lib.core.settings import BRUTE_COLUMN_EXISTS_TEMPLATE
 from lib.core.settings import BRUTE_TABLE_EXISTS_TEMPLATE
-from lib.core.session import safeFormatString
 from lib.core.threads import getCurrentThreadData
 from lib.core.threads import runThreads
 from lib.request import inject

lib/techniques/error/use.py

@@ -8,9 +8,9 @@ See the file 'doc/COPYING' for copying permission
 """
 
 import re
-import threading
 import time
 
+from extra.safe2bin.safe2bin import safecharencode
 from lib.core.agent import agent
 from lib.core.bigarray import BigArray
 from lib.core.common import Backend
@@ -23,19 +23,14 @@ from lib.core.common import incrementCounter
 from lib.core.common import initTechnique
 from lib.core.common import isNumPosStrValue
 from lib.core.common import listToStrValue
-from lib.core.common import randomInt
 from lib.core.common import readInput
-from lib.core.common import safeStringFormat
 from lib.core.convert import htmlunescape
-from lib.core.convert import safecharencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.enums import DBMS
-from lib.core.enums import EXPECTED
 from lib.core.enums import PAYLOAD
-from lib.core.exception import sqlmapConnectionException
 from lib.core.settings import FROM_DUMMY_TABLE
 from lib.core.settings import MYSQL_ERROR_CHUNK_LENGTH
 from lib.core.settings import MSSQL_ERROR_CHUNK_LENGTH
@@ -203,7 +198,6 @@ def errorUse(expression, expected=None, dump=False):
     output = None
     outputs = []
     untilLimitChar = None
-    untilOrderChar = None
 
     _, _, _, _, _, expressionFieldsList, expressionFields, _ = agent.getFields(expression)
 

lib/techniques/union/test.py

@@ -9,15 +9,10 @@ See the file 'doc/COPYING' for copying permission
 
 import random
 import re
-import time
 
 from lib.core.agent import agent
 from lib.core.common import average
 from lib.core.common import Backend
-from lib.core.common import clearConsoleLine
-from lib.core.common import dataToStdout
-from lib.core.common import extractRegexResult
-from lib.core.common import getUnicode
 from lib.core.common import isNullValue
 from lib.core.common import listToStrValue
 from lib.core.common import popValue
@@ -32,8 +27,6 @@ from lib.core.common import wasLastRequestDBMSError
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
-from lib.core.data import queries
-from lib.core.enums import DBMS
 from lib.core.enums import PAYLOAD
 from lib.core.settings import FROM_DUMMY_TABLE
 from lib.core.settings import UNION_MIN_RESPONSE_CHARS

lib/techniques/union/use.py

@@ -8,9 +8,9 @@ See the file 'doc/COPYING' for copying permission
 """
 
 import re
-import threading
 import time
 
+from extra.safe2bin.safe2bin import safecharencode
 from lib.core.agent import agent
 from lib.core.bigarray import BigArray
 from lib.core.common import Backend
@@ -27,14 +27,12 @@ from lib.core.common import listToStrValue
 from lib.core.common import parseUnionPage
 from lib.core.common import removeReflectiveValues
 from lib.core.common import singleTimeWarnMessage
-from lib.core.convert import safecharencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.enums import DBMS
 from lib.core.enums import PAYLOAD
-from lib.core.exception import sqlmapConnectionException
 from lib.core.exception import sqlmapSyntaxException
 from lib.core.settings import FROM_DUMMY_TABLE
 from lib.core.settings import SQL_SCALAR_REGEX

lib/utils/checkpayload.py

@@ -12,7 +12,6 @@ import re
 from lib.core.common import getCompiledRegex
 from lib.core.common import readXmlFile
 from lib.core.convert import urldecode
-from lib.core.data import conf
 from lib.core.data import paths
 from lib.core.data import logger
 

lib/utils/crawler.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 import httplib
 import re
-import threading
 import urlparse
 import time
 

lib/utils/deps.py

@@ -7,10 +7,8 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.enums import DBMS
-from lib.core.exception import sqlmapMissingDependence
 from lib.core.settings import DBMS_DICT
 from lib.core.settings import IS_WIN
 

lib/utils/google.py

@@ -15,7 +15,6 @@ import urllib2
 
 from lib.core.common import getUnicode
 from lib.core.common import readInput
-from lib.core.convert import htmlunescape
 from lib.core.convert import urldecode
 from lib.core.convert import urlencode
 from lib.core.data import conf
@@ -84,7 +83,7 @@ class Google:
             _ = conn.info()
         except urllib2.HTTPError, e:
             _ = e.info()
-        except urllib2.URLError, _:
+        except urllib2.URLError:
             errMsg = "unable to connect to Google"
             raise sqlmapConnectionException, errMsg
 
@@ -134,7 +133,7 @@ class Google:
                 warnMsg += "to get error page information (%d)" % e.code
                 logger.critical(warnMsg)
                 return None
-        except (urllib2.URLError, socket.error, socket.timeout), _:
+        except (urllib2.URLError, socket.error, socket.timeout):
             errMsg = "unable to connect to Google"
             raise sqlmapConnectionException, errMsg
 

lib/utils/hash.py

@@ -23,14 +23,11 @@ except (ImportError, OSError):
 else:
     _multiprocessing = multiprocessing
 
-import os
-import re
 import time
 
 from hashlib import md5
 from hashlib import sha1
 from Queue import Queue
-from zipfile import ZipFile
 
 from extra.pydes.pyDes import des
 from extra.pydes.pyDes import CBC
@@ -63,7 +60,6 @@ from lib.core.settings import HASH_MOD_ITEM_DISPLAY
 from lib.core.settings import HASH_RECOGNITION_QUIT_THRESHOLD
 from lib.core.settings import IS_WIN
 from lib.core.settings import ITOA64
-from lib.core.settings import PYVERSION
 from lib.core.settings import ML
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.settings import ROTATING_CHARS

lib/utils/hashdb.py

@@ -13,7 +13,6 @@ import threading
 
 from lib.core.common import serializeObject
 from lib.core.common import unserializeObject
-from lib.core.data import conf
 from lib.core.settings import HASHDB_FLUSH_THRESHOLD
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.threads import getCurrentThreadData

lib/utils/resume.py

@@ -24,7 +24,6 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.enums import DBMS
-from lib.core.enums import PAYLOAD
 from lib.core.unescaper import unescaper
 from lib.techniques.blind.inference import bisection
 

plugins/dbms/access/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import ACCESS_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.access.enumeration import Enumeration
 from plugins.dbms.access.filesystem import Filesystem
 from plugins.dbms.access.fingerprint import Fingerprint

plugins/dbms/access/connector.py

@@ -12,12 +12,10 @@ try:
 except ImportError, _:
     pass
 
-from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.settings import IS_WIN
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/access/filesystem.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/access/fingerprint.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 import re
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.common import getCurrentThreadData
@@ -23,10 +22,7 @@ from lib.core.enums import DBMS
 from lib.core.session import setDbms
 from lib.core.settings import ACCESS_ALIASES
 from lib.core.settings import METADB_SUFFIX
-from lib.core.threads import getCurrentThreadData
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/access/takeover.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/db2/connector.py

@@ -14,7 +14,6 @@ except ImportError, _:
 
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/db2/filesystem.py

@@ -7,15 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.common import randomStr
-from lib.core.data import conf
-from lib.core.data import kb
-from lib.core.data import logger
-from lib.core.enums import PLACE
-from lib.core.exception import sqlmapNoneDataException
-from lib.request import inject
-#from lib.techniques.inband.union.use import unionUse
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/db2/fingerprint.py

@@ -18,7 +18,6 @@ from lib.core.enums import DBMS
 from lib.core.session import setDbms
 from lib.core.settings import DB2_ALIASES
 from lib.request import inject
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/db2/takeover.py

@@ -7,21 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
-from lib.core.agent import agent
-from lib.core.common import isTechniqueAvailable
-from lib.core.common import normalizePath
-from lib.core.common import ntToPosixSlashes
-from lib.core.common import randomStr
-from lib.core.common import readInput
-from lib.core.data import kb
-from lib.core.data import logger
-from lib.core.data import paths
-from lib.core.enums import PAYLOAD
-from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/firebird/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import FIREBIRD_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.firebird.enumeration import Enumeration
 from plugins.dbms.firebird.filesystem import Filesystem
 from plugins.dbms.firebird.fingerprint import Fingerprint

plugins/dbms/firebird/connector.py

@@ -15,7 +15,6 @@ except ImportError, _:
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
 from lib.core.settings import UNICODE_ENCODING
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/firebird/filesystem.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/firebird/fingerprint.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 import re
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.common import getUnicode
@@ -24,8 +23,6 @@ from lib.core.settings import FIREBIRD_ALIASES
 from lib.core.settings import METADB_SUFFIX
 from lib.core.settings import UNKNOWN_DBMS_VERSION
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/firebird/takeover.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/maxdb/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import MAXDB_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.maxdb.enumeration import Enumeration
 from plugins.dbms.maxdb.filesystem import Filesystem
 from plugins.dbms.maxdb.fingerprint import Fingerprint

plugins/dbms/maxdb/connector.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/maxdb/enumeration.py

@@ -8,16 +8,13 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.common import Backend
-from lib.core.common import isTechniqueAvailable
 from lib.core.common import randomStr
 from lib.core.common import safeSQLIdentificatorNaming
-from lib.core.common import unArrayizeValue
 from lib.core.common import unsafeSQLIdentificatorNaming
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
-from lib.core.enums import PAYLOAD
 from lib.core.exception import sqlmapMissingMandatoryOptionException
 from lib.core.exception import sqlmapNoneDataException
 from lib.core.settings import CURRENT_DB

plugins/dbms/maxdb/filesystem.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/maxdb/fingerprint.py

@@ -7,13 +7,9 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
 from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
-from lib.core.common import randomInt
-from lib.core.common import randomRange
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -22,7 +18,6 @@ from lib.core.session import setDbms
 from lib.core.settings import MAXDB_ALIASES
 from lib.request import inject
 from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/maxdb/syntax.py

@@ -7,7 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.exception import sqlmapSyntaxException
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/maxdb/takeover.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/mssqlserver/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import MSSQL_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.mssqlserver.enumeration import Enumeration
 from plugins.dbms.mssqlserver.filesystem import Filesystem
 from plugins.dbms.mssqlserver.fingerprint import Fingerprint

plugins/dbms/mssqlserver/connector.py

@@ -17,7 +17,6 @@ from lib.core.convert import utf8encode
 from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/mssqlserver/enumeration.py

@@ -16,7 +16,6 @@ from lib.core.common import isNoneValue
 from lib.core.common import isNumPosStrValue
 from lib.core.common import isTechniqueAvailable
 from lib.core.common import safeSQLIdentificatorNaming
-from lib.core.common import unArrayizeValue
 from lib.core.common import unsafeSQLIdentificatorNaming
 from lib.core.data import conf
 from lib.core.data import kb

plugins/dbms/mssqlserver/filesystem.py

@@ -17,7 +17,6 @@ from lib.core.common import isTechniqueAvailable
 from lib.core.common import posixToNtSlashes
 from lib.core.common import randomStr
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import PAYLOAD
 from lib.core.exception import sqlmapNoneDataException

plugins/dbms/mssqlserver/fingerprint.py

@@ -7,7 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.common import getUnicode
@@ -19,10 +18,7 @@ from lib.core.enums import DBMS
 from lib.core.enums import OS
 from lib.core.session import setDbms
 from lib.core.settings import MSSQL_ALIASES
-from lib.core.settings import UNKNOWN_DBMS_VERSION
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/mssqlserver/syntax.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapSyntaxException
-
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/mssqlserver/takeover.py

@@ -10,11 +10,9 @@ See the file 'doc/COPYING' for copying permission
 import binascii
 
 from lib.core.common import Backend
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.request import inject
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/mysql/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import MYSQL_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.mysql.enumeration import Enumeration
 from plugins.dbms.mysql.filesystem import Filesystem
 from plugins.dbms.mysql.fingerprint import Fingerprint

plugins/dbms/mysql/connector.py

@@ -15,7 +15,6 @@ except ImportError, _:
 from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/mysql/filesystem.py

@@ -18,7 +18,6 @@ from lib.core.enums import PLACE
 from lib.core.exception import sqlmapNoneDataException
 from lib.request import inject
 from lib.techniques.union.use import unionUse
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/mysql/fingerprint.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 import re
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.common import getUnicode
@@ -19,13 +18,10 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
 from lib.core.enums import OS
-from lib.core.enums import PLACE
 from lib.core.session import setDbms
 from lib.core.settings import MYSQL_ALIASES
 from lib.core.settings import UNKNOWN_DBMS_VERSION
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/mysql/takeover.py

@@ -22,7 +22,6 @@ from lib.core.enums import OS
 from lib.core.enums import PAYLOAD
 from lib.request import inject
 from lib.request.connect import Connect as Request
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/oracle/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import ORACLE_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.oracle.enumeration import Enumeration
 from plugins.dbms.oracle.filesystem import Filesystem
 from plugins.dbms.oracle.fingerprint import Fingerprint

plugins/dbms/oracle/connector.py

@@ -17,7 +17,6 @@ import os
 from lib.core.convert import utf8encode
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 os.environ["NLS_LANG"] = ".AL32UTF8"

plugins/dbms/oracle/enumeration.py

@@ -7,15 +7,12 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import getLimitRange
 from lib.core.common import isInferenceAvailable
 from lib.core.common import isNoneValue
 from lib.core.common import isNumPosStrValue
 from lib.core.common import isTechniqueAvailable
-from lib.core.common import safeSQLIdentificatorNaming
-from lib.core.common import unsafeSQLIdentificatorNaming
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -24,7 +21,6 @@ from lib.core.enums import EXPECTED
 from lib.core.enums import PAYLOAD
 from lib.core.exception import sqlmapNoneDataException
 from lib.request import inject
-
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):

plugins/dbms/oracle/filesystem.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/oracle/fingerprint.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 import re
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.data import conf
@@ -19,8 +18,6 @@ from lib.core.enums import DBMS
 from lib.core.session import setDbms
 from lib.core.settings import ORACLE_ALIASES
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/oracle/takeover.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/postgresql/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import PGSQL_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.postgresql.enumeration import Enumeration
 from plugins.dbms.postgresql.filesystem import Filesystem
 from plugins.dbms.postgresql.fingerprint import Fingerprint

plugins/dbms/postgresql/connector.py

@@ -17,7 +17,6 @@ except ImportError, _:
 
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/postgresql/enumeration.py

@@ -7,7 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.enums import DBMS
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):

plugins/dbms/postgresql/filesystem.py

@@ -14,7 +14,6 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.request import inject
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/postgresql/fingerprint.py

@@ -7,9 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.common import getUnicode
@@ -23,8 +20,6 @@ from lib.core.session import setDbms
 from lib.core.settings import PGSQL_ALIASES
 from lib.core.settings import PGSQL_SYSTEM_DBS
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/postgresql/takeover.py

@@ -15,7 +15,6 @@ from lib.core.data import paths
 from lib.core.enums import OS
 from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.request import inject
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/sqlite/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import SQLITE_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.sqlite.enumeration import Enumeration
 from plugins.dbms.sqlite.filesystem import Filesystem
 from plugins.dbms.sqlite.fingerprint import Fingerprint

plugins/dbms/sqlite/connector.py

@@ -17,7 +17,6 @@ from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
 from lib.core.exception import sqlmapMissingDependence
-
 from plugins.generic.connector import Connector as GenericConnector
 
 

plugins/dbms/sqlite/filesystem.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/sqlite/fingerprint.py

@@ -7,7 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
 from lib.core.data import conf
@@ -18,8 +17,6 @@ from lib.core.session import setDbms
 from lib.core.settings import METADB_SUFFIX
 from lib.core.settings import SQLITE_ALIASES
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/sqlite/syntax.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 from lib.core.common import isDBMSVersionAtLeast
 from lib.core.exception import sqlmapSyntaxException
-
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/sqlite/takeover.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/dbms/sybase/__init__.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 from lib.core.enums import DBMS
 from lib.core.settings import SYBASE_SYSTEM_DBS
 from lib.core.unescaper import unescaper
-
 from plugins.dbms.sybase.enumeration import Enumeration
 from plugins.dbms.sybase.filesystem import Filesystem
 from plugins.dbms.sybase.fingerprint import Fingerprint

plugins/dbms/sybase/connector.py

@@ -17,7 +17,6 @@ from lib.core.convert import utf8encode
 from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.exception import sqlmapConnectionException
-
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):

plugins/dbms/sybase/enumeration.py

@@ -12,7 +12,6 @@ from lib.core.common import filterPairValues
 from lib.core.common import isTechniqueAvailable
 from lib.core.common import randomStr
 from lib.core.common import safeSQLIdentificatorNaming
-from lib.core.common import unArrayizeValue
 from lib.core.common import unsafeSQLIdentificatorNaming
 from lib.core.data import conf
 from lib.core.data import kb

plugins/dbms/sybase/filesystem.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.filesystem import Filesystem as GenericFilesystem
 
 class Filesystem(GenericFilesystem):

plugins/dbms/sybase/fingerprint.py

@@ -7,10 +7,8 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-from lib.core.agent import agent
 from lib.core.common import Backend
 from lib.core.common import Format
-from lib.core.common import randomInt
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -19,8 +17,6 @@ from lib.core.enums import OS
 from lib.core.session import setDbms
 from lib.core.settings import SYBASE_ALIASES
 from lib.request import inject
-from lib.request.connect import Connect as Request
-
 from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
 
 class Fingerprint(GenericFingerprint):

plugins/dbms/sybase/syntax.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapSyntaxException
-
 from plugins.generic.syntax import Syntax as GenericSyntax
 
 class Syntax(GenericSyntax):

plugins/dbms/sybase/takeover.py

@@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.exception import sqlmapUnsupportedFeatureException
-
 from plugins.generic.takeover import Takeover as GenericTakeover
 
 class Takeover(GenericTakeover):

plugins/generic/enumeration.py

@@ -8,8 +8,8 @@ See the file 'doc/COPYING' for copying permission
 """
 
 import re
-import time
 
+from extra.safe2bin.safe2bin import safechardecode
 from lib.core.agent import agent
 from lib.core.bigarray import BigArray
 from lib.core.common import arrayizeValue
@@ -18,7 +18,6 @@ from lib.core.common import clearConsoleLine
 from lib.core.common import dataToStdout
 from lib.core.common import filterPairValues
 from lib.core.common import getLimitRange
-from lib.core.common import getCompiledRegex
 from lib.core.common import getUnicode
 from lib.core.common import isInferenceAvailable
 from lib.core.common import isNoneValue
@@ -30,13 +29,11 @@ from lib.core.common import popValue
 from lib.core.common import pushValue
 from lib.core.common import randomStr
 from lib.core.common import readInput
-from lib.core.common import safeStringFormat
 from lib.core.common import safeSQLIdentificatorNaming
 from lib.core.common import singleTimeWarnMessage
 from lib.core.common import strToHex
 from lib.core.common import unArrayizeValue
 from lib.core.common import unsafeSQLIdentificatorNaming
-from lib.core.convert import safechardecode
 from lib.core.convert import utf8decode
 from lib.core.data import conf
 from lib.core.data import kb
@@ -60,15 +57,12 @@ from lib.core.session import setOs
 from lib.core.settings import CONCAT_ROW_DELIMITER
 from lib.core.settings import CONCAT_VALUE_DELIMITER
 from lib.core.settings import CURRENT_DB
-from lib.core.settings import DEFAULT_MSSQL_SCHEMA
 from lib.core.settings import MAX_INT
 from lib.core.settings import SQL_STATEMENTS
 from lib.core.shell import autoCompletion
-from lib.core.unescaper import unescaper
 from lib.core.threads import getCurrentThreadData
 from lib.parse.banner import bannerParser
 from lib.request import inject
-from lib.request.connect import Connect as Request
 from lib.techniques.brute.use import columnExists
 from lib.techniques.brute.use import tableExists
 from lib.utils.hash import attackDumpedTable

plugins/generic/filesystem.py

@@ -10,7 +10,6 @@ See the file 'doc/COPYING' for copying permission
 import binascii
 import codecs
 import os
-import re
 
 from lib.core.agent import agent
 from lib.core.common import dataToOutFile
@@ -19,12 +18,9 @@ from lib.core.common import isTechniqueAvailable
 from lib.core.common import randomStr
 from lib.core.common import readInput
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
-from lib.core.enums import OS
 from lib.core.enums import PAYLOAD
-from lib.core.exception import sqlmapFilePathException
 from lib.core.exception import sqlmapUndefinedMethod
 from lib.request import inject
 

plugins/generic/fingerprint.py

@@ -9,7 +9,6 @@ See the file 'doc/COPYING' for copying permission
 
 from lib.core.common import Backend
 from lib.core.common import readInput
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import OS
 from lib.core.exception import sqlmapUndefinedMethod

plugins/generic/misc.py

@@ -7,8 +7,6 @@ Copyright (c) 2006-2012 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-import re
-
 from lib.core.common import getCompiledRegex
 from lib.core.common import Backend
 from lib.core.common import isTechniqueAvailable

plugins/generic/takeover.py

@@ -14,7 +14,6 @@ from lib.core.common import isTechniqueAvailable
 from lib.core.common import readInput
 from lib.core.common import runningAsAdmin
 from lib.core.data import conf
-from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
 from lib.core.enums import OS