aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance/conformance_python.py
diff options
context:
space:
mode:
Diffstat (limited to 'conformance/conformance_python.py')
-rwxr-xr-xconformance/conformance_python.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/conformance/conformance_python.py b/conformance/conformance_python.py
index a490c8e8..2f4a7812 100755
--- a/conformance/conformance_python.py
+++ b/conformance/conformance_python.py
@@ -67,7 +67,7 @@ def do_test(request):
elif request.WhichOneof('payload') == 'json_payload':
try:
json_format.Parse(request.json_payload, test_message)
- except json_format.ParseError as e:
+ except Exception as e:
response.parse_error = str(e)
return response
@@ -81,7 +81,11 @@ def do_test(request):
response.protobuf_payload = test_message.SerializeToString()
elif request.requested_output_format == conformance_pb2.JSON:
- response.json_payload = json_format.MessageToJson(test_message)
+ try:
+ response.json_payload = json_format.MessageToJson(test_message)
+ except Exception as e:
+ response.serialize_error = str(e)
+ return response
except Exception as e:
response.runtime_error = str(e)