CERBERUS/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-10-22 19:53:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Dealing with basesting (one baby step closer to Py3 salvation)

Browse source
This commit is contained in:
Miroslav Stampar 2019-03-28 13:53:54 +01:00
parent 915bc1fc99
commit afe497a954
25 changed files with 112 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/generic/entries.py
View file

@ -45,6 +45,7 @@ from lib.core.settings import NULL
from lib.request import inject
from lib.utils.hash import attackDumpedTable
from lib.utils.pivotdumptable import pivotDumpTable
from thirdparty import six
class Entries:
"""
@ -244,7 +245,7 @@ class Entries:
logger.warn(warnMsg)
if not isNoneValue(entries):
if isinstance(entries, basestring):
if isinstance(entries, six.string_types):
entries = [entries]
elif not isListLike(entries):
entries = []
@ -259,7 +260,7 @@ class Entries:
if entry is None or len(entry) == 0:
continue
if isinstance(entry, basestring):
if isinstance(entry, six.string_types):
colEntry = entry
else:
colEntry = unArrayizeValue(entry[index]) if index < len(entry) else u''