From ab33651f96cb55d0c1e129ccbc6753c715cc7b76 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 16 Nov 2010 15:02:22 +0000 Subject: [PATCH] minor bug fix for displaying text from windows machines (\r was interfering with normal dataToStdout behavior) --- lib/core/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index cd8a2675b..560232e23 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -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)