From 0a4427bb89603b5e3429cdb4289aff564b1eb8fc Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 22 Jan 2022 14:26:12 +0000 Subject: [PATCH] scripts/gendiff.py: DOS CR fix --- scripts/gendiff.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/gendiff.py b/scripts/gendiff.py index f5e1ac40..143efd81 100755 --- a/scripts/gendiff.py +++ b/scripts/gendiff.py @@ -19,20 +19,19 @@ from difflib import unified_diff fns = sys.argv[1:] translate = { -# '\r': '[CR]\n', - '\r': '', + '\r': None, '\b': '[BS]', # chr(4): '', # Ctrl-D, EOT } def cleanup_file(fn): - with open(fn) as fp: - data = fp.read() + # must use binary mode to prevent conversion of DOS CR into newline + with open(fn,'rb') as fp: + data = fp.read().decode() def gen_text(): - for line in data.splitlines(): -# line = re.sub('\r\n','\n',line) # DOS CRLF to Unix LF + for line in data.split('\n'): # do not use splitlines() line = line.translate({ord(a):b for a,b in translate.items()}) line = re.sub(r'\s+$','',line) # trailing whitespace yield line