improve handling of newline on Windows

This commit is contained in:
Johan Holmberg 2015-06-15 22:11:02 +02:00
parent 35c6425a44
commit 4d1fdabb55

View File

@ -42,7 +42,7 @@ ORIG_CWD = os.getcwd()
def to_content(lines): def to_content(lines):
return ''.join(line + "\n" for line in lines) return ''.join(line + "\n" for line in lines)
def to_lines(content): def to_lines(content, newline="\n"):
lines = content.split("\n") lines = content.split("\n")
if lines[-1] == '': if lines[-1] == '':
lines.pop() lines.pop()
@ -104,7 +104,7 @@ class File:
self.content = f.read() self.content = f.read()
def lines(self, encoding): def lines(self, encoding):
return to_lines(self.content.decode(encoding=encoding)) return to_lines(self.content.decode(encoding=encoding), os.linesep)
#---------------------------------------------------------------------- #----------------------------------------------------------------------