third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/conformance/conformance_python.py

 #!/usr/bin/env python
 #
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
 # https://developers.google.com/protocol-buffers/
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
@@ skipping 20 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """A conformance test implementation for the Python protobuf library.
 
 See conformance.proto for more information.
 """
 
 import struct
 import sys
 import os
+from google.protobuf import json_format
 from google.protobuf import message
-from google.protobuf import json_format
+from google.protobuf import test_messages_proto3_pb2
 import conformance_pb2
 
 sys.stdout = os.fdopen(sys.stdout.fileno(), 'wb', 0)
 sys.stdin = os.fdopen(sys.stdin.fileno(), 'rb', 0)
 
 test_count = 0
 verbose = False
 
 class ProtocolError(Exception):
   pass
 
 def do_test(request):
-  test_message = conformance_pb2.TestAllTypes()
+  test_message = test_messages_proto3_pb2.TestAllTypes()
   response = conformance_pb2.ConformanceResponse()
-  test_message = conformance_pb2.TestAllTypes()
+  test_message = test_messages_proto3_pb2.TestAllTypes()
 
   try:
     if request.WhichOneof('payload') == 'protobuf_payload':
       try:
         test_message.ParseFromString(request.protobuf_payload)
       except message.DecodeError as e:
         response.parse_error = str(e)
         return response
 
     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
 
     else:
       raise ProtocolError("Request didn't have payload.")
 
     if request.requested_output_format == conformance_pb2.UNSPECIFIED:
       raise ProtocolError("Unspecified output format")
 
     elif request.requested_output_format == conformance_pb2.PROTOBUF:
       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)
 
   return response
 
 def do_test_io():
   length_bytes = sys.stdin.read(4)
   if len(length_bytes) == 0:
     return False   # EOF
@@ skipping 26 matching lines @@
   global test_count
   test_count += 1
 
   return True
 
 while True:
   if not do_test_io():
     sys.stderr.write("conformance_python: received EOF from test runner " +
                      "after %s tests, exiting\n" % (test_count))
     sys.exit(0)