Minor style update

This commit is contained in:
Miroslav Stampar 2014-08-20 00:28:33 +02:00
parent 77ba63b060
commit c12e51173a
2 changed files with 3 additions and 3 deletions

View File

@ -278,7 +278,7 @@ def _unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix)
test = readInput(message, default="Y") test = readInput(message, default="Y")
if test[0] not in ("y", "Y"): if test[0] not in ("y", "Y"):
warnMsg += "usage of option '--union-char' " warnMsg += "usage of option '--union-char' "
warnMsg += "(e.g. --union-char=1) " warnMsg += "(e.g. '--union-char=1') "
else: else:
conf.uChar = kb.uChar = str(randomInt(2)) conf.uChar = kb.uChar = str(randomInt(2))
validPayload, vector = _unionConfirm(comment, place, parameter, prefix, suffix, count) validPayload, vector = _unionConfirm(comment, place, parameter, prefix, suffix, count)
@ -288,7 +288,7 @@ def _unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix)
warnMsg += "and/or try to force the " warnMsg += "and/or try to force the "
else: else:
warnMsg += "forcing the " warnMsg += "forcing the "
warnMsg += "back-end DBMS (e.g. --dbms=mysql) " warnMsg += "back-end DBMS (e.g. '--dbms=mysql') "
if not all([validPayload, vector]) and not warnMsg.endswith("consider "): if not all([validPayload, vector]) and not warnMsg.endswith("consider "):
singleTimeWarnMessage(warnMsg) singleTimeWarnMessage(warnMsg)

View File

@ -316,7 +316,7 @@ def unionUse(expression, unpack=True, dump=False):
del threadData.shared.buffered[0] del threadData.shared.buffered[0]
if conf.verbose == 1 and not (threadData.resumed and kb.suppressResumeInfo) and not threadData.shared.showEta: if conf.verbose == 1 and not (threadData.resumed and kb.suppressResumeInfo) and not threadData.shared.showEta:
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items))))) status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("'%s'" % _ for _ in flattenValue(arrayizeValue(items)))))
if len(status) > width: if len(status) > width:
status = "%s..." % status[:width - 3] status = "%s..." % status[:width - 3]