sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-07-29 17:39:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring for Python 3 idioms

Browse Source 
* 2to3 `ls | grep -v thirdparty` -f idioms
This commit is contained in:
akun 2018-03-07 18:44:13 +08:00
parent 6907e15a0e
commit 3ce0322fe7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/common.py
View File

@ -1525,8 +1525,7 @@ def expandAsteriskForColumns(expression):
columnsDict = conf.dbmsHandler.getColumns(onlyColNames=True) columnsDict = conf.dbmsHandler.getColumns(onlyColNames=True)
if columnsDict and conf.db in columnsDict and conf.tbl in columnsDict[conf.db]: if columnsDict and conf.db in columnsDict and conf.tbl in columnsDict[conf.db]:
columns = columnsDict[conf.db][conf.tbl].keys() columns = sorted(columnsDict[conf.db][conf.tbl].keys())
columns.sort()
columnsStr = ", ".join(column for column in columns) columnsStr = ", ".join(column for column in columns)
expression = expression.replace('*', columnsStr, 1) expression = expression.replace('*', columnsStr, 1)

3
lib/core/option.py
View File

@ -430,8 +430,7 @@ def _setMultipleTargets():
_feedTargetsDict(conf.logFile, addedTargetUrls) _feedTargetsDict(conf.logFile, addedTargetUrls)
elif os.path.isdir(conf.logFile): elif os.path.isdir(conf.logFile):
files = os.listdir(conf.logFile) files = sorted(os.listdir(conf.logFile))
files.sort()
for reqFile in files: for reqFile in files:
if not re.search(r"([\d]+)\-request", reqFile): if not re.search(r"([\d]+)\-request", reqFile):

2
lib/core/testing.py
View File

@ -98,7 +98,7 @@ def smokeTest():
def adjustValueType(tagName, value): def adjustValueType(tagName, value):
for family in optDict.keys(): for family in optDict.keys():
for name, type_ in optDict[family].items(): for name, type_ in optDict[family].items():
if type(type_) == tuple: if isinstance(type_, tuple):
type_ = type_[0] type_ = type_[0]
if tagName == name: if tagName == name:
if type_ == "boolean": if type_ == "boolean":