attempting to upgrade to proto 3.5
This commit is contained in:
1 parent
eb1b42a5e8
commit
cc3510c6c2
368 files changed
+35764
-24867
No files matched your search
@@ -58,6 +58,7 @@ import weakref
|
||||
import six
|
||||
|
||||
# We use "as" to avoid name collisions with variables.
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import containers
|
||||
from google.protobuf.internal import decoder
|
||||
from google.protobuf.internal import encoder
|
||||
@@ -1009,11 +1010,16 @@ def _AddByteSizeMethod(message_descriptor, cls):
|
||||
return self._cached_byte_size
|
||||
|
||||
size = 0
|
||||
for field_descriptor, field_value in self.ListFields():
|
||||
size += field_descriptor._sizer(field_value)
|
||||
|
||||
for tag_bytes, value_bytes in self._unknown_fields:
|
||||
size += len(tag_bytes) + len(value_bytes)
|
||||
descriptor = self.DESCRIPTOR
|
||||
if descriptor.GetOptions().map_entry:
|
||||
# Fields of map entry should always be serialized.
|
||||
size = descriptor.fields_by_name['key']._sizer(self.key)
|
||||
size += descriptor.fields_by_name['value']._sizer(self.value)
|
||||
else:
|
||||
for field_descriptor, field_value in self.ListFields():
|
||||
size += field_descriptor._sizer(field_value)
|
||||
for tag_bytes, value_bytes in self._unknown_fields:
|
||||
size += len(tag_bytes) + len(value_bytes)
|
||||
|
||||
self._cached_byte_size = size
|
||||
self._cached_byte_size_dirty = False
|
||||
@@ -1026,32 +1032,46 @@ def _AddByteSizeMethod(message_descriptor, cls):
|
||||
def _AddSerializeToStringMethod(message_descriptor, cls):
|
||||
"""Helper for _AddMessageMethods()."""
|
||||
|
||||
def SerializeToString(self):
|
||||
def SerializeToString(self, **kwargs):
|
||||
# Check if the message has all of its required fields set.
|
||||
errors = []
|
||||
if not self.IsInitialized():
|
||||
raise message_mod.EncodeError(
|
||||
'Message %s is missing required fields: %s' % (
|
||||
self.DESCRIPTOR.full_name, ','.join(self.FindInitializationErrors())))
|
||||
return self.SerializePartialToString()
|
||||
return self.SerializePartialToString(**kwargs)
|
||||
cls.SerializeToString = SerializeToString
|
||||
|
||||
|
||||
def _AddSerializePartialToStringMethod(message_descriptor, cls):
|
||||
"""Helper for _AddMessageMethods()."""
|
||||
|
||||
def SerializePartialToString(self):
|
||||
def SerializePartialToString(self, **kwargs):
|
||||
out = BytesIO()
|
||||
self._InternalSerialize(out.write)
|
||||
self._InternalSerialize(out.write, **kwargs)
|
||||
return out.getvalue()
|
||||
cls.SerializePartialToString = SerializePartialToString
|
||||
|
||||
def InternalSerialize(self, write_bytes):
|
||||
for field_descriptor, field_value in self.ListFields():
|
||||
field_descriptor._encoder(write_bytes, field_value)
|
||||
for tag_bytes, value_bytes in self._unknown_fields:
|
||||
write_bytes(tag_bytes)
|
||||
write_bytes(value_bytes)
|
||||
def InternalSerialize(self, write_bytes, deterministic=None):
|
||||
if deterministic is None:
|
||||
deterministic = (
|
||||
api_implementation.IsPythonDefaultSerializationDeterministic())
|
||||
else:
|
||||
deterministic = bool(deterministic)
|
||||
|
||||
descriptor = self.DESCRIPTOR
|
||||
if descriptor.GetOptions().map_entry:
|
||||
# Fields of map entry should always be serialized.
|
||||
descriptor.fields_by_name['key']._encoder(
|
||||
write_bytes, self.key, deterministic)
|
||||
descriptor.fields_by_name['value']._encoder(
|
||||
write_bytes, self.value, deterministic)
|
||||
else:
|
||||
for field_descriptor, field_value in self.ListFields():
|
||||
field_descriptor._encoder(write_bytes, field_value, deterministic)
|
||||
for tag_bytes, value_bytes in self._unknown_fields:
|
||||
write_bytes(tag_bytes)
|
||||
write_bytes(value_bytes)
|
||||
cls._InternalSerialize = InternalSerialize
|
||||
|
||||
|
||||
@@ -1089,7 +1109,8 @@ def _AddMergeFromStringMethod(message_descriptor, cls):
|
||||
new_pos = local_SkipField(buffer, new_pos, end, tag_bytes)
|
||||
if new_pos == -1:
|
||||
return pos
|
||||
if not is_proto3:
|
||||
if (not is_proto3 or
|
||||
api_implementation.GetPythonProto3PreserveUnknownsDefault()):
|
||||
if not unknown_field_list:
|
||||
unknown_field_list = self._unknown_fields = []
|
||||
unknown_field_list.append(
|
||||
|
||||
Reference in new issue
Block a user