Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d9a931f

Browse files
stamparmstamparm
committed
Minor cleanup
1 parent 0e206da commit d9a931f

13 files changed

Lines changed: 15 additions & 27 deletions

File tree

‎lib/controller/handler.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from lib.core.common import Backend
99
from lib.core.data import conf
1010
from lib.core.data import kb
11-
from lib.core.data import logger
1211
from lib.core.dicts import DBMS_DICT
1312
from lib.core.enums import DBMS
1413
from lib.core.settings import MSSQL_ALIASES

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from lib.core.enums import OS
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.1.4.24"
22+
VERSION = "1.1.4.25"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎lib/core/threads.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import difflib
99
import random
10-
import thread
1110
import threading
1211
import time
1312
import traceback
@@ -151,7 +150,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
151150

152151
try:
153152
thread.start()
154-
except thread.error, ex:
153+
except Exception, ex:
155154
errMsg = "error occurred while starting new thread ('%s')" % ex.message
156155
logger.critical(errMsg)
157156
break
@@ -208,7 +207,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
208207
if lock.locked():
209208
try:
210209
lock.release()
211-
except thread.error:
210+
except:
212211
pass
213212

214213
if conf.get("hashDB"):

‎plugins/dbms/firebird/fingerprint.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from lib.core.session import setDbms
1919
from lib.core.settings import FIREBIRD_ALIASES
2020
from lib.core.settings import METADB_SUFFIX
21-
from lib.core.settings import UNKNOWN_DBMS_VERSION
2221
from lib.request import inject
2322
from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
2423

‎plugins/dbms/hsqldb/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from lib.core.data import kb
1111
from lib.core.data import logger
1212
from lib.core.data import queries
13-
from lib.core.common import Backend
1413
from lib.core.common import unArrayizeValue
1514
from lib.core.enums import DBMS
1615
from lib.core.settings import HSQLDB_DEFAULT_SCHEMA

‎plugins/dbms/hsqldb/fingerprint.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from lib.core.enums import DBMS
1717
from lib.core.session import setDbms
1818
from lib.core.settings import HSQLDB_ALIASES
19-
from lib.core.settings import UNKNOWN_DBMS_VERSION
2019
from lib.request import inject
2120
from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
2221

‎plugins/dbms/maxdb/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
See the file 'doc/COPYING' for copying permission
66
"""
77

8-
from lib.core.common import Backend
98
from lib.core.common import randomStr
109
from lib.core.common import readInput
1110
from lib.core.common import safeSQLIdentificatorNaming

‎plugins/dbms/mssqlserver/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from lib.core.agent import agent
99
from lib.core.common import arrayizeValue
10-
from lib.core.common import Backend
1110
from lib.core.common import getLimitRange
1211
from lib.core.common import isInferenceAvailable
1312
from lib.core.common import isNoneValue

‎plugins/dbms/mysql/fingerprint.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from lib.core.enums import OS
2121
from lib.core.session import setDbms
2222
from lib.core.settings import MYSQL_ALIASES
23-
from lib.core.settings import UNKNOWN_DBMS_VERSION
2423
from lib.request import inject
2524
from plugins.generic.fingerprint import Fingerprint as GenericFingerprint
2625

‎plugins/dbms/oracle/enumeration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
See the file 'doc/COPYING' for copying permission
66
"""
77

8-
from lib.core.common import Backend
98
from lib.core.common import getLimitRange
109
from lib.core.common import isAdminFromPrivileges
1110
from lib.core.common import isInferenceAvailable

0 commit comments

Comments
 (0)