diff --git a/rhodecode/lib/__init__.py b/rhodecode/lib/__init__.py --- a/rhodecode/lib/__init__.py +++ b/rhodecode/lib/__init__.py @@ -83,19 +83,32 @@ def str2bool(_str): return _str in ('t', 'true', 'y', 'yes', 'on', '1') -def convert_line_endings(temp, mode): +def convert_line_endings(line, mode): + """ + Converts a given line "line end" accordingly to given mode + + Available modes are:: + 0 - Unix + 1 - Mac + 2 - DOS + + :param line: given line to convert + :param mode: mode to convert to + :rtype: str + :return: converted line according to mode + """ from string import replace - #modes: 0 - Unix, 1 - Mac, 2 - DOS + if mode == 0: - temp = replace(temp, '\r\n', '\n') - temp = replace(temp, '\r', '\n') + line = replace(line, '\r\n', '\n') + line = replace(line, '\r', '\n') elif mode == 1: - temp = replace(temp, '\r\n', '\r') - temp = replace(temp, '\n', '\r') + line = replace(line, '\r\n', '\r') + line = replace(line, '\n', '\r') elif mode == 2: import re - temp = re.sub("\r(?!\n)|(? 2 and uri[2]: + uri[2] = ':' + uri[2] + + return ''.join(uri) +