From 1cf012521d949fc8e03575a9fd61369aed2092fa Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 26 Aug 2015 16:18:03 +0200 Subject: [PATCH] Minor refactoring --- lib/core/shell.py | 1 - lib/parse/configfile.py | 6 ------ lib/takeover/web.py | 3 --- lib/utils/api.py | 2 -- lib/utils/hash.py | 1 - plugins/dbms/postgresql/filesystem.py | 1 - plugins/generic/filesystem.py | 1 - 7 files changed, 15 deletions(-) diff --git a/lib/core/shell.py b/lib/core/shell.py index 1e7f35d50..7b53bc389 100644 --- a/lib/core/shell.py +++ b/lib/core/shell.py @@ -10,7 +10,6 @@ import os import rlcompleter from lib.core import readlineng as readline -from lib.core.common import Backend from lib.core.data import logger from lib.core.data import paths from lib.core.enums import AUTOCOMPLETE_TYPE diff --git a/lib/parse/configfile.py b/lib/parse/configfile.py index 507cce17b..dbbc5ad78 100644 --- a/lib/parse/configfile.py +++ b/lib/parse/configfile.py @@ -5,11 +5,6 @@ Copyright (c) 2006-2015 sqlmap developers (http://sqlmap.org/) See the file 'doc/COPYING' for copying permission """ -import codecs - -from ConfigParser import MissingSectionHeaderError -from ConfigParser import ParsingError - from lib.core.common import checkFile from lib.core.common import getUnicode from lib.core.common import openFile @@ -20,7 +15,6 @@ from lib.core.data import logger from lib.core.exception import SqlmapMissingMandatoryOptionException from lib.core.exception import SqlmapSyntaxException from lib.core.optiondict import optDict -from lib.core.settings import UNICODE_ENCODING config = None diff --git a/lib/takeover/web.py b/lib/takeover/web.py index 40a403dc0..504fb4a2c 100644 --- a/lib/takeover/web.py +++ b/lib/takeover/web.py @@ -205,7 +205,6 @@ class Web: backdoorContent = decloak(os.path.join(paths.SQLMAP_SHELL_PATH, "backdoor.%s_" % self.webApi)) stagerContent = decloak(os.path.join(paths.SQLMAP_SHELL_PATH, "stager.%s_" % self.webApi)) - success = False for directory in directories: if not directory: @@ -357,6 +356,4 @@ class Web: infoMsg += self.webBackdoorUrl logger.info(infoMsg) - success = True - break diff --git a/lib/utils/api.py b/lib/utils/api.py index 1db28e7cd..4b63fbfe6 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -13,8 +13,6 @@ import sys import tempfile import time -from subprocess import PIPE - from lib.core.common import unArrayizeValue from lib.core.convert import base64pickle from lib.core.convert import hexencode diff --git a/lib/utils/hash.py b/lib/utils/hash.py index 87ae8d411..81af27026 100644 --- a/lib/utils/hash.py +++ b/lib/utils/hash.py @@ -44,7 +44,6 @@ from lib.core.common import clearConsoleLine from lib.core.common import dataToStdout from lib.core.common import getFileItems from lib.core.common import getPublicTypeMembers -from lib.core.common import getUnicode from lib.core.common import hashDBRetrieve from lib.core.common import hashDBWrite from lib.core.common import normalizeUnicode diff --git a/plugins/dbms/postgresql/filesystem.py b/plugins/dbms/postgresql/filesystem.py index 72cf7c75f..bfa285091 100644 --- a/plugins/dbms/postgresql/filesystem.py +++ b/plugins/dbms/postgresql/filesystem.py @@ -8,7 +8,6 @@ See the file 'doc/COPYING' for copying permission import os from lib.core.common import randomInt -from lib.core.data import kb from lib.core.data import logger from lib.core.exception import SqlmapUnsupportedFeatureException from lib.core.settings import LOBLKSIZE diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py index 0aaae5b83..21b698b4e 100644 --- a/plugins/generic/filesystem.py +++ b/plugins/generic/filesystem.py @@ -20,7 +20,6 @@ from lib.core.common import isListLike from lib.core.common import isStackingAvailable from lib.core.common import isTechniqueAvailable from lib.core.common import readInput -from lib.core.common import unArrayizeValue from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger