Mercurial > kallithea
changeset 8063:9bc709aa0614
lib: avoid import string.replace
Odd way to do it ... and gone in py3.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 21 Dec 2019 16:29:11 +0100 |
| parents | 9203621cae03 |
| children | 8fb1b9e7106a |
| files | kallithea/lib/utils2.py |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/utils2.py Sat Dec 28 01:08:48 2019 +0100 +++ b/kallithea/lib/utils2.py Sat Dec 21 16:29:11 2019 +0100 @@ -99,14 +99,12 @@ :rtype: str :return: converted line according to mode """ - from string import replace - if mode == 0: - line = replace(line, '\r\n', '\n') - line = replace(line, '\r', '\n') + line = line.replace('\r\n', '\n') + line = line.replace('\r', '\n') elif mode == 1: - line = replace(line, '\r\n', '\r') - line = replace(line, '\n', '\r') + line = line.replace('\r\n', '\r') + line = line.replace('\n', '\r') elif mode == 2: line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line) return line