diff --git a/tools/releasetools/target_files_diff.py b/tools/releasetools/target_files_diff.py index 4402c8d20e..fa94c5b9ce 100755 --- a/tools/releasetools/target_files_diff.py +++ b/tools/releasetools/target_files_diff.py @@ -82,7 +82,7 @@ def rewrite_build_property(original, new): skip = True break if not skip: - new.write(line) + new.write(line.encode()) def trim_install_recovery(original, new): @@ -91,7 +91,7 @@ def trim_install_recovery(original, new): partition. """ for line in original: - new.write(re.sub(r'[0-9a-f]{40}', '0'*40, line)) + new.write(re.sub(r'[0-9a-f]{40}', '0'*40, line).encode()) def sort_file(original, new): """ @@ -101,7 +101,7 @@ def sort_file(original, new): lines = original.readlines() lines.sort() for line in lines: - new.write(line) + new.write(line.encode()) # Map files to the functions that will modify them for diffing REWRITE_RULES = { @@ -148,7 +148,7 @@ def diff(name, file1, file2, out_file): if stdout == 'Binary files %s and %s differ' % (f1, f2): print("%s: Binary files differ" % name, file=out_file) else: - for line in stdout.strip().split('\n'): + for line in stdout.strip().split(b'\n'): print("%s: %s" % (name, line), file=out_file) def recursiveDiff(prefix, dir1, dir2, out_file):