mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-03 13:14:13 +03:00
Minor refactoring
This commit is contained in:
parent
53847447fd
commit
b08e4aed83
|
@ -18,7 +18,7 @@ from lib.core.enums import OS
|
|||
from thirdparty.six import unichr as _unichr
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.3.5.148"
|
||||
VERSION = "1.3.5.149"
|
||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||
|
|
|
@ -49,7 +49,7 @@ class Enumeration(GenericEnumeration):
|
|||
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.schemaname' % kb.aliasName], blind=True)
|
||||
|
||||
if retVal:
|
||||
kb.data.cachedDbs = six.itervalues(retVal[0]).next()
|
||||
kb.data.cachedDbs = next(six.itervalues(retVal[0]))
|
||||
|
||||
if kb.data.cachedDbs:
|
||||
kb.data.cachedDbs.sort()
|
||||
|
|
|
@ -103,7 +103,7 @@ class Enumeration(GenericEnumeration):
|
|||
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName)
|
||||
|
||||
if retVal:
|
||||
kb.data.cachedDbs = six.itervalues(retVal[0]).next()
|
||||
kb.data.cachedDbs = next(six.itervalues(retVal[0]))
|
||||
break
|
||||
|
||||
if kb.data.cachedDbs:
|
||||
|
@ -147,7 +147,7 @@ class Enumeration(GenericEnumeration):
|
|||
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName)
|
||||
|
||||
if retVal:
|
||||
for table in six.itervalues(retVal[0]).next():
|
||||
for table in next(six.itervalues(retVal[0])):
|
||||
if db not in kb.data.cachedTables:
|
||||
kb.data.cachedTables[db] = [table]
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue
Block a user