commit 13a08290d897e9d2a87cb5928d4aefd61e871318
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 16 03:01:31 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 16 03:01:31 2021 +0000
tree f24d4e60c188900a0be0c1c1e4824c29a5f68f2a
parent d9ed3996604b50d2f60b3f4336dfa46d92951176
parent cf18c9d36393544e0fb71ace080ff648d59ea8b9

Snap for 7829765 from cf18c9d36393544e0fb71ace080ff648d59ea8b9 to tm-release

Change-Id: I9123328e79f6d16aa0cc5d96ba60f71248182e24

update_verifier/care_map_generator.py

diff --git a/update_verifier/care_map_generator.py b/update_verifier/care_map_generator.py
index c6f2dad..b1396a4 100644
--- a/update_verifier/care_map_generator.py
+++ b/update_verifier/care_map_generator.py
@@ -111,14 +111,14 @@
   logging.basicConfig(level=logging.INFO if args.verbose else logging.WARNING,
                       format=logging_format)
 
-  with open(args.input_care_map, 'r') as input_care_map:
+  with open(args.input_care_map, 'rb') as input_care_map:
     content = input_care_map.read()
 
   if args.parse_proto:
     result = ParseProtoMessage(content, args.fingerprint_enabled).encode()
   else:
     care_map_proto = GenerateCareMapProtoFromLegacyFormat(
-        content.rstrip().splitlines(), args.fingerprint_enabled)
+        content.decode().rstrip().splitlines(), args.fingerprint_enabled)
     result = care_map_proto.SerializeToString()
 
   with open(args.output_file, 'wb') as output: