From 982e8327a07c5da2eda2798ac184779bf3f8d2c7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 4 Jan 2018 13:48:29 -0500 Subject: Specify encoding when comparing files in Python --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 149f8701..ea6b7c51 100644 --- a/wscript +++ b/wscript @@ -214,8 +214,8 @@ def upload_docs(ctx): os.system('rsync -avz --delete -e ssh build/%s.html drobilla@drobilla.net:~/drobilla.net/man/' % page) def file_equals(patha, pathb, subst_from='', subst_to=''): - with open(patha, 'rU') as fa: - with open(pathb, 'rU') as fb: + with open(patha, 'rU', encoding='utf-8') as fa: + with open(pathb, 'rU', encoding='utf-8') as fb: for linea in fa: lineb = fb.readline() if (linea.replace(subst_from, subst_to) != @@ -257,8 +257,8 @@ def check_output(out_filename, check_filename, subst_from='', subst_to=''): elif not file_equals(check_filename, out_filename, subst_from, subst_to): Logs.pprint('RED', 'FAIL: %s != %s' % (os.path.abspath(out_filename), check_filename)) - with open(out_filename) as out_file: - with open(check_filename) as check_file: + with open(out_filename, encoding='utf-8') as out_file: + with open(check_filename, encoding='utf-8') as check_file: diff = difflib.unified_diff(check_file.readlines(), out_file.readlines(), fromfile=check_filename, -- cgit v1.2.1