From 4d1fdabb556c13ff1229e47a5a233d48eba2cbb5 Mon Sep 17 00:00:00 2001 From: Johan Holmberg Date: Mon, 15 Jun 2015 22:11:02 +0200 Subject: [PATCH] improve handling of newline on Windows --- python/cmdtest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/cmdtest.py b/python/cmdtest.py index 05ccd1e..1bd54f0 100755 --- a/python/cmdtest.py +++ b/python/cmdtest.py @@ -42,7 +42,7 @@ ORIG_CWD = os.getcwd() def to_content(lines): return ''.join(line + "\n" for line in lines) -def to_lines(content): +def to_lines(content, newline="\n"): lines = content.split("\n") if lines[-1] == '': lines.pop() @@ -104,7 +104,7 @@ class File: self.content = f.read() def lines(self, encoding): - return to_lines(self.content.decode(encoding=encoding)) + return to_lines(self.content.decode(encoding=encoding), os.linesep) #----------------------------------------------------------------------