minor bug fix for displaying text from windows machines (\r was interfering with normal dataToStdout behavior)

This commit is contained in:
Miroslav Stampar 2010-11-16 15:02:22 +00:00
parent 3487429eac
commit ab33651f96

View File

@ -575,9 +575,9 @@ def replaceNewlineTabs(inpStr, stdout=False):
return
if stdout:
replacedString = inpStr.replace("\n", " ").replace("\t", " ")
replacedString = inpStr.replace("\n", " ").replace("\r", " ").replace("\t", " ")
else:
replacedString = inpStr.replace("\n", DUMP_NEWLINE_MARKER).replace("\t", DUMP_TAB_MARKER)
replacedString = inpStr.replace("\n", DUMP_NEWLINE_MARKER).replace("\r", " ").replace("\t", DUMP_TAB_MARKER)
replacedString = replacedString.replace(kb.misc.delimiter, DUMP_DEL_MARKER)