From e9cfeeda13aea1bf945bb66e4582fe6a9336fb60 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 2 Feb 2016 14:44:44 +0300 Subject: hercules: Extent string utils functions. Now they can remove useless \r char. --- hercules/code/stringutils.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'hercules/code/stringutils.py') diff --git a/hercules/code/stringutils.py b/hercules/code/stringutils.py index 9dcbff8..0bcfaa7 100644 --- a/hercules/code/stringutils.py +++ b/hercules/code/stringutils.py @@ -30,8 +30,19 @@ def strToXml(data): def stripNewLine(data): if len(data) == 0: return data - if data[-1] == "\n": + if data[-1] == "\r": data = data[:-1] + if len(data) > 0 and data[-1] == "\n": + data = data[:-1] + return data + +def stripWindows(data): + if len(data) == 0: + return data + if data[-1] == "\r": + data = data[:-1] + if len(data) > 1 and data[-2] == "\r": + data = data[:-2] + data[-1] return data def escapeSqlStr(data): -- cgit v1.2.3-70-g09d2