Merge branch 'wb-proto' of personal.github.com:mandiant/capa into wb-proto

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## master (unreleased)
 
 ### New Features
-- add protobuf format for result documents #1219 @williballenthin
+- add protobuf format for result documents #1219 @williballenthin @mr-tz 
 
 - new cli flag `--os` to override auto-detected operating system for a sample @captainGeech42
 

tests/fixtures.py

@@ -1109,10 +1109,7 @@ def _039a6_dotnetfile_extractor():
 
 
 def get_result_doc(path):
-    with open(path, "rb") as f:
-        buf = f.read()
-    src = buf.decode("utf-8")
-    return capa.render.result_document.ResultDocument.parse_raw(src)
+    return capa.render.result_document.ResultDocument.parse_file(path)
 
 
 @pytest.fixture