Improvement for Issue #71: exception when in fileReadMode

This commit is contained in:
aNiceGuy 2012-07-08 13:15:10 +01:00
parent 28f16fe07a
commit 105cd225b3

View File

@ -177,7 +177,10 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N
if kb.fileReadMode and output and output.strip(): if kb.fileReadMode and output and output.strip():
print print
elif output is not None and not (threadData.resumed and kb.suppressResumeInfo): elif output is not None and not (threadData.resumed and kb.suppressResumeInfo):
dataToStdout("[%s] [INFO] %s #%d: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(output))) if kb.fileReadMode == False:
dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(output)))
else:
dataToStdout("[%s] [INFO] %s #%d: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(output)))
if isinstance(num, int): if isinstance(num, int):
expression = origExpr expression = origExpr