diff --git a/lib/controller/checks.py b/lib/controller/checks.py index 4c1e14c7e..7840bf162 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -15,7 +15,6 @@ from subprocess import Popen as execute from extra.beep.beep import beep from lib.core.agent import agent -from lib.core.common import arrayizeValue from lib.core.common import Backend from lib.core.common import extractRegexResult from lib.core.common import extractTextTagContent @@ -46,7 +45,6 @@ from lib.core.datatype import AttribDict from lib.core.datatype import InjectionDict from lib.core.decorators import cachedmethod from lib.core.dicts import FROM_DUMMY_TABLE -from lib.core.enums import CUSTOM_LOGGING from lib.core.enums import DBMS from lib.core.enums import HEURISTIC_TEST from lib.core.enums import HTTP_HEADER @@ -66,7 +64,6 @@ from lib.core.settings import HEURISTIC_CHECK_ALPHABET from lib.core.settings import SUHOSIN_MAX_VALUE_LENGTH from lib.core.settings import SUPPORTED_DBMS from lib.core.settings import URI_HTTP_HEADER -from lib.core.settings import LOWER_RATIO_BOUND from lib.core.settings import UPPER_RATIO_BOUND from lib.core.settings import IDS_WAF_CHECK_PAYLOAD from lib.core.settings import IDS_WAF_CHECK_RATIO diff --git a/lib/core/common.py b/lib/core/common.py index 16a377ea2..6c5099d67 100755 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -97,7 +97,6 @@ from lib.core.settings import DBMS_DIRECTORY_DICT from lib.core.settings import DEFAULT_COOKIE_DELIMITER from lib.core.settings import DEFAULT_GET_POST_DELIMITER from lib.core.settings import DEFAULT_MSSQL_SCHEMA -from lib.core.settings import DESCRIPTION from lib.core.settings import DUMMY_USER_INJECTION from lib.core.settings import DYNAMICITY_MARK_LENGTH from lib.core.settings import ERROR_PARSING_REGEXES @@ -134,9 +133,7 @@ from lib.core.settings import REFLECTED_MAX_REGEX_PARTS from lib.core.settings import REFLECTED_REPLACEMENT_REGEX from lib.core.settings import REFLECTED_VALUE_MARKER from lib.core.settings import REFLECTIVE_MISS_THRESHOLD -from lib.core.settings import REVISION from lib.core.settings import SENSITIVE_DATA_REGEX -from lib.core.settings import SITE from lib.core.settings import SUPPORTED_DBMS from lib.core.settings import TEXT_TAG_REGEX from lib.core.settings import TIME_STDEV_COEFF @@ -146,7 +143,6 @@ from lib.core.settings import URI_QUESTION_MARKER from lib.core.settings import URLENCODE_CHAR_LIMIT from lib.core.settings import URLENCODE_FAILSAFE_CHARS from lib.core.settings import USER_AGENT_ALIASES -from lib.core.settings import VERSION from lib.core.settings import VERSION_STRING from lib.core.threads import getCurrentThreadData from lib.utils.sqlalchemy import _sqlalchemy @@ -1027,7 +1023,7 @@ def checkFile(filename): if valid: try: - with open(filename, "rb") as f: + with open(filename, "rb"): pass except: valid = False diff --git a/lib/core/dump.py b/lib/core/dump.py index c6272e4d3..d3b9cc799 100644 --- a/lib/core/dump.py +++ b/lib/core/dump.py @@ -6,7 +6,6 @@ See the file 'doc/COPYING' for copying permission """ import cgi -import codecs import hashlib import os import re @@ -22,7 +21,6 @@ from lib.core.common import normalizeUnicode from lib.core.common import openFile from lib.core.common import prioritySortColumns from lib.core.common import randomInt -from lib.core.common import randomStr from lib.core.common import safeCSValue from lib.core.common import unicodeencode from lib.core.common import unsafeSQLIdentificatorNaming diff --git a/lib/core/option.py b/lib/core/option.py index 97f211e17..33345c57b 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -53,7 +53,6 @@ from lib.core.common import readInput from lib.core.common import resetCookieJar from lib.core.common import runningAsAdmin from lib.core.common import safeExpandUser -from lib.core.common import sanitizeStr from lib.core.common import setOptimize from lib.core.common import setPaths from lib.core.common import singleTimeWarnMessage diff --git a/lib/core/settings.py b/lib/core/settings.py index 62da62fd2..a356390d9 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -6,7 +6,6 @@ See the file 'doc/COPYING' for copying permission """ import os -import random import re import subprocess import string diff --git a/lib/core/shell.py b/lib/core/shell.py index d4ca035e0..1e7f35d50 100644 --- a/lib/core/shell.py +++ b/lib/core/shell.py @@ -43,7 +43,7 @@ def saveHistory(completion=None): historyPath = paths.SQLMAP_SHELL_HISTORY try: - with open(historyPath, "w+") as f: + with open(historyPath, "w+"): pass except: pass @@ -92,7 +92,7 @@ class CompleterNG(rlcompleter.Completer): matches.append(word) return matches - + def autoCompletion(completion=None, os=None, commands=None): if not readlineAvailable(): return diff --git a/lib/parse/payloads.py b/lib/parse/payloads.py index c98a7f014..a96867082 100644 --- a/lib/parse/payloads.py +++ b/lib/parse/payloads.py @@ -10,7 +10,6 @@ import os from xml.etree import ElementTree as et from lib.core.data import conf -from lib.core.data import logger from lib.core.data import paths from lib.core.datatype import AttribDict from lib.core.exception import SqlmapInstallationException @@ -89,8 +88,6 @@ def loadPayloads(): for payloadFile in payloadFiles: payloadFilePath = os.path.join(paths.SQLMAP_XML_PAYLOADS_PATH, payloadFile) - #logger.debug("Parsing payloads from file '%s'" % payloadFile) - try: doc = et.parse(payloadFilePath) except Exception, ex: diff --git a/lib/request/connect.py b/lib/request/connect.py index 94d1e4576..94ce9887e 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -822,7 +822,6 @@ class Connect(object): retVal = paramString match = re.search("%s=(?P[^&]*)" % re.escape(parameter), paramString) if match: - origValue = match.group("value") retVal = re.sub("%s=[^&]*" % re.escape(parameter), "%s=%s" % (parameter, newValue), paramString) return retVal diff --git a/lib/request/httpshandler.py b/lib/request/httpshandler.py index bbd291e15..6906f4686 100644 --- a/lib/request/httpshandler.py +++ b/lib/request/httpshandler.py @@ -7,7 +7,6 @@ See the file 'doc/COPYING' for copying permission import httplib import socket -import sys import urllib2 from lib.core.data import kb diff --git a/lib/utils/api.py b/lib/utils/api.py index 357d4d3b5..c007289b5 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission import logging import os -import shutil import sqlite3 import sys import tempfile diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py index ffac14e13..be47608e1 100644 --- a/lib/utils/crawler.py +++ b/lib/utils/crawler.py @@ -5,7 +5,6 @@ Copyright (c) 2006-2015 sqlmap developers (http://sqlmap.org/) See the file 'doc/COPYING' for copying permission """ -import codecs import httplib import os import re @@ -19,13 +18,11 @@ from lib.core.common import findPageForms from lib.core.common import openFile from lib.core.common import readInput from lib.core.common import safeCSValue -from lib.core.common import singleTimeWarnMessage from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger from lib.core.exception import SqlmapConnectionException from lib.core.settings import CRAWL_EXCLUDE_EXTENSIONS -from lib.core.settings import UNICODE_ENCODING from lib.core.threads import getCurrentThreadData from lib.core.threads import runThreads from lib.parse.sitemap import parseSitemap diff --git a/lib/utils/hash.py b/lib/utils/hash.py index bc3f06f2a..123b93ee7 100644 --- a/lib/utils/hash.py +++ b/lib/utils/hash.py @@ -59,7 +59,6 @@ from lib.core.data import kb from lib.core.data import logger from lib.core.enums import DBMS from lib.core.enums import HASH -from lib.core.exception import SqlmapFilePathException from lib.core.exception import SqlmapUserQuitException from lib.core.settings import COMMON_PASSWORD_SUFFIXES from lib.core.settings import COMMON_USER_COLUMNS diff --git a/lib/utils/sqlalchemy.py b/lib/utils/sqlalchemy.py index 9e24bba30..1b654ef2f 100644 --- a/lib/utils/sqlalchemy.py +++ b/lib/utils/sqlalchemy.py @@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission import imp import logging import os -import re import sys import warnings diff --git a/plugins/dbms/mssqlserver/filesystem.py b/plugins/dbms/mssqlserver/filesystem.py index eca533d01..53e197a0d 100644 --- a/plugins/dbms/mssqlserver/filesystem.py +++ b/plugins/dbms/mssqlserver/filesystem.py @@ -343,7 +343,6 @@ class Filesystem(GenericFilesystem): logger.info(infoMsg) chunkMaxSize = 500 - dFileName = ntpath.basename(dFile) randFile = "tmpf%s.txt" % randomStr(lowercase=True) randFilePath = "%s\%s" % (tmpPath, randFile) diff --git a/sqlmap.py b/sqlmap.py index 81b3e756e..161aa6727 100755 --- a/sqlmap.py +++ b/sqlmap.py @@ -12,7 +12,6 @@ import os import re import shutil import sys -import tempfile import time import traceback import warnings @@ -28,7 +27,6 @@ from lib.core.common import createGithubIssue from lib.core.common import dataToStdout from lib.core.common import getUnicode from lib.core.common import maskSensitiveData -from lib.core.common import setColor from lib.core.common import setPaths from lib.core.common import weAreFrozen from lib.core.data import cmdLineOptions diff --git a/waf/360.py b/waf/360.py index cc8b4c615..86c251c20 100644 --- a/waf/360.py +++ b/waf/360.py @@ -7,7 +7,6 @@ See the file 'doc/COPYING' for copying permission import re -from lib.core.enums import HTTP_HEADER from lib.core.settings import WAF_ATTACK_VECTORS __product__ = "360 Web Application Firewall (360)" diff --git a/waf/anquanbao.py b/waf/anquanbao.py index 430ce942a..6842c8a35 100644 --- a/waf/anquanbao.py +++ b/waf/anquanbao.py @@ -7,7 +7,6 @@ See the file 'doc/COPYING' for copying permission import re -from lib.core.enums import HTTP_HEADER from lib.core.settings import WAF_ATTACK_VECTORS __product__ = "Anquanbao Web Application Firewall (Anquanbao)" diff --git a/waf/baidu.py b/waf/baidu.py index fc9cc9d21..7a15feadb 100644 --- a/waf/baidu.py +++ b/waf/baidu.py @@ -7,7 +7,6 @@ See the file 'doc/COPYING' for copying permission import re -from lib.core.enums import HTTP_HEADER from lib.core.settings import WAF_ATTACK_VECTORS __product__ = "Yunjiasu Web Application Firewall (Baidu)" diff --git a/waf/safedog.py b/waf/safedog.py index 63c7fdddd..31b706e18 100644 --- a/waf/safedog.py +++ b/waf/safedog.py @@ -7,7 +7,6 @@ See the file 'doc/COPYING' for copying permission import re -from lib.core.enums import HTTP_HEADER from lib.core.settings import WAF_ATTACK_VECTORS __product__ = "Safedog Web Application Firewall (Safedog)" diff --git a/waf/senginx.py b/waf/senginx.py index a4bdb1bf2..15a4223f2 100644 --- a/waf/senginx.py +++ b/waf/senginx.py @@ -5,9 +5,6 @@ Copyright (c) 2006-2015 sqlmap developers (http://sqlmap.org/) See the file 'doc/COPYING' for copying permission """ -import re - -from lib.core.enums import HTTP_HEADER from lib.core.settings import WAF_ATTACK_VECTORS __product__ = "SEnginx (Neusoft Corporation)"