commit c88a1efca985a39607ba726115837d40803ceeea
author Kelvin Zhang <zhangkelvin@google.com> Tue Oct 12 14:43:40 2021 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Oct 12 15:02:32 2021 -0700
tree c9c63e4d8c51d3f11d4cf4f50732674af1c8f0bb
parent c9549c19ce56c31fdfb3f0efe35d266d828903f3

Update caremap to by py3 compatible

Py3 doesn't mix bytes/str, so be explicit about which one

Test: th
Change-Id: Ia091b8378da93f19c3eb7c944199163aa9c63de7

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: