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
@@ -30,7 +30,7 @@
|
||||
|
||||
# Copyright 2007 Google Inc. All Rights Reserved.
|
||||
|
||||
__version__ = '3.3.0'
|
||||
__version__ = '3.5.0'
|
||||
|
||||
if __name__ != '__main__':
|
||||
try:
|
||||
|
||||
@@ -38,14 +38,14 @@ _ANY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.Any.value', index=1,
|
||||
number=2, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -40,21 +40,21 @@ _TESTANY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='any_value', full_name='protobuf_unittest.TestAny.any_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_any_value', full_name='protobuf_unittest.TestAny.repeated_any_value', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -41,49 +41,49 @@ _API = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='methods', full_name='google.protobuf.Api.methods', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='options', full_name='google.protobuf.Api.options', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='version', full_name='google.protobuf.Api.version', index=3,
|
||||
number=4, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='source_context', full_name='google.protobuf.Api.source_context', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='mixins', full_name='google.protobuf.Api.mixins', index=5,
|
||||
number=6, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='syntax', full_name='google.protobuf.Api.syntax', index=6,
|
||||
number=7, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -114,49 +114,49 @@ _METHOD = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='request_type_url', full_name='google.protobuf.Method.request_type_url', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='request_streaming', full_name='google.protobuf.Method.request_streaming', index=2,
|
||||
number=3, type=8, cpp_type=7, label=1,
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='response_type_url', full_name='google.protobuf.Method.response_type_url', index=3,
|
||||
number=4, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='response_streaming', full_name='google.protobuf.Method.response_streaming', index=4,
|
||||
number=5, type=8, cpp_type=7, label=1,
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='options', full_name='google.protobuf.Method.options', index=5,
|
||||
number=6, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='syntax', full_name='google.protobuf.Method.syntax', index=6,
|
||||
number=7, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -187,14 +187,14 @@ _MIXIN = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='root', full_name='google.protobuf.Mixin.root', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -40,28 +40,28 @@ _VERSION = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='minor', full_name='google.protobuf.compiler.Version.minor', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='patch', full_name='google.protobuf.compiler.Version.patch', index=2,
|
||||
number=3, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='suffix', full_name='google.protobuf.compiler.Version.suffix', index=3,
|
||||
number=4, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -92,28 +92,28 @@ _CODEGENERATORREQUEST = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='parameter', full_name='google.protobuf.compiler.CodeGeneratorRequest.parameter', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='proto_file', full_name='google.protobuf.compiler.CodeGeneratorRequest.proto_file', index=2,
|
||||
number=15, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='compiler_version', full_name='google.protobuf.compiler.CodeGeneratorRequest.compiler_version', index=3,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -144,21 +144,21 @@ _CODEGENERATORRESPONSE_FILE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='insertion_point', full_name='google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='content', full_name='google.protobuf.compiler.CodeGeneratorResponse.File.content', index=2,
|
||||
number=15, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -188,14 +188,14 @@ _CODEGENERATORRESPONSE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='file', full_name='google.protobuf.compiler.CodeGeneratorResponse.file', index=1,
|
||||
number=15, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -406,6 +406,8 @@ class FieldDescriptor(DescriptorBase):
|
||||
|
||||
containing_oneof: (OneofDescriptor) If the field is a member of a oneof
|
||||
union, contains its descriptor. Otherwise, None.
|
||||
|
||||
file: (FileDescriptor) Reference to file descriptor.
|
||||
"""
|
||||
|
||||
# Must be consistent with C++ FieldDescriptor::Type enum in
|
||||
@@ -490,7 +492,8 @@ class FieldDescriptor(DescriptorBase):
|
||||
def __new__(cls, name, full_name, index, number, type, cpp_type, label,
|
||||
default_value, message_type, enum_type, containing_type,
|
||||
is_extension, extension_scope, options=None,
|
||||
has_default_value=True, containing_oneof=None, json_name=None):
|
||||
has_default_value=True, containing_oneof=None, json_name=None,
|
||||
file=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
if is_extension:
|
||||
return _message.default_pool.FindExtensionByName(full_name)
|
||||
@@ -500,7 +503,8 @@ class FieldDescriptor(DescriptorBase):
|
||||
def __init__(self, name, full_name, index, number, type, cpp_type, label,
|
||||
default_value, message_type, enum_type, containing_type,
|
||||
is_extension, extension_scope, options=None,
|
||||
has_default_value=True, containing_oneof=None, json_name=None):
|
||||
has_default_value=True, containing_oneof=None, json_name=None,
|
||||
file=None):
|
||||
"""The arguments are as described in the description of FieldDescriptor
|
||||
attributes above.
|
||||
|
||||
@@ -511,6 +515,7 @@ class FieldDescriptor(DescriptorBase):
|
||||
super(FieldDescriptor, self).__init__(options, 'FieldOptions')
|
||||
self.name = name
|
||||
self.full_name = full_name
|
||||
self.file = file
|
||||
self._camelcase_name = None
|
||||
if json_name is None:
|
||||
self.json_name = _ToJsonName(name)
|
||||
|
||||
@@ -107,6 +107,7 @@ class DescriptorDatabase(object):
|
||||
|
||||
'some.package.name.Message'
|
||||
'some.package.name.Message.NestedEnum'
|
||||
'some.package.name.Message.some_field'
|
||||
|
||||
The file descriptor proto containing the specified symbol must be added to
|
||||
this database using the Add method or else an error will be raised.
|
||||
@@ -120,8 +121,16 @@ class DescriptorDatabase(object):
|
||||
Raises:
|
||||
KeyError if no file contains the specified symbol.
|
||||
"""
|
||||
|
||||
return self._file_desc_protos_by_symbol[symbol]
|
||||
try:
|
||||
return self._file_desc_protos_by_symbol[symbol]
|
||||
except KeyError:
|
||||
# Fields, enum values, and nested extensions are not in
|
||||
# _file_desc_protos_by_symbol. Try to find the top level
|
||||
# descriptor. Non-existent nested symbol under a valid top level
|
||||
# descriptor can also be found. The behavior is the same with
|
||||
# protobuf C++.
|
||||
top_level, _, _ = symbol.rpartition('.')
|
||||
return self._file_desc_protos_by_symbol[top_level]
|
||||
|
||||
|
||||
def _ExtractSymbols(desc_proto, package):
|
||||
@@ -134,8 +143,7 @@ def _ExtractSymbols(desc_proto, package):
|
||||
Yields:
|
||||
The fully qualified name found in the descriptor.
|
||||
"""
|
||||
|
||||
message_name = '.'.join((package, desc_proto.name))
|
||||
message_name = package + '.' + desc_proto.name if package else desc_proto.name
|
||||
yield message_name
|
||||
for nested_type in desc_proto.nested_type:
|
||||
for symbol in _ExtractSymbols(nested_type, message_name):
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -127,9 +127,6 @@ class DescriptorPool(object):
|
||||
self._service_descriptors = {}
|
||||
self._file_descriptors = {}
|
||||
self._toplevel_extensions = {}
|
||||
# TODO(jieluo): Remove _file_desc_by_toplevel_extension when
|
||||
# FieldDescriptor.file is added in code gen.
|
||||
self._file_desc_by_toplevel_extension = {}
|
||||
# We store extensions in two two-level mappings: The first key is the
|
||||
# descriptor of the message being extended, the second key is the extension
|
||||
# full name or its tag number.
|
||||
@@ -255,11 +252,6 @@ class DescriptorPool(object):
|
||||
"""
|
||||
|
||||
self._AddFileDescriptor(file_desc)
|
||||
# TODO(jieluo): This is a temporary solution for FieldDescriptor.file.
|
||||
# Remove it when FieldDescriptor.file is added in code gen.
|
||||
for extension in file_desc.extensions_by_name.values():
|
||||
self._file_desc_by_toplevel_extension[
|
||||
extension.full_name] = file_desc
|
||||
|
||||
def _AddFileDescriptor(self, file_desc):
|
||||
"""Adds a FileDescriptor to the pool, non-recursively.
|
||||
@@ -328,13 +320,18 @@ class DescriptorPool(object):
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
try:
|
||||
return self._service_descriptors[symbol].file
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
try:
|
||||
return self._FindFileContainingSymbolInDb(symbol)
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
try:
|
||||
return self._file_desc_by_toplevel_extension[symbol]
|
||||
return self._toplevel_extensions[symbol].file
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
@@ -344,7 +341,6 @@ class DescriptorPool(object):
|
||||
message = self.FindMessageTypeByName(message_name)
|
||||
assert message.extensions_by_name[extension_name]
|
||||
return message.file
|
||||
|
||||
except KeyError:
|
||||
raise KeyError('Cannot find a file containing %s' % symbol)
|
||||
|
||||
@@ -401,6 +397,23 @@ class DescriptorPool(object):
|
||||
message_descriptor = self.FindMessageTypeByName(message_name)
|
||||
return message_descriptor.fields_by_name[field_name]
|
||||
|
||||
def FindOneofByName(self, full_name):
|
||||
"""Loads the named oneof descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the oneof descriptor to load.
|
||||
|
||||
Returns:
|
||||
The oneof descriptor for the named oneof.
|
||||
|
||||
Raises:
|
||||
KeyError: if the oneof cannot be found in the pool.
|
||||
"""
|
||||
full_name = _NormalizeFullyQualifiedName(full_name)
|
||||
message_name, _, oneof_name = full_name.rpartition('.')
|
||||
message_descriptor = self.FindMessageTypeByName(message_name)
|
||||
return message_descriptor.oneofs_by_name[oneof_name]
|
||||
|
||||
def FindExtensionByName(self, full_name):
|
||||
"""Loads the named extension descriptor from the pool.
|
||||
|
||||
@@ -557,7 +570,8 @@ class DescriptorPool(object):
|
||||
|
||||
for index, extension_proto in enumerate(file_proto.extension):
|
||||
extension_desc = self._MakeFieldDescriptor(
|
||||
extension_proto, file_proto.package, index, is_extension=True)
|
||||
extension_proto, file_proto.package, index, file_descriptor,
|
||||
is_extension=True)
|
||||
extension_desc.containing_type = self._GetTypeFromScope(
|
||||
file_descriptor.package, extension_proto.extendee, scope)
|
||||
self._SetFieldType(extension_proto, extension_desc,
|
||||
@@ -623,10 +637,10 @@ class DescriptorPool(object):
|
||||
enums = [
|
||||
self._ConvertEnumDescriptor(enum, desc_name, file_desc, None, scope)
|
||||
for enum in desc_proto.enum_type]
|
||||
fields = [self._MakeFieldDescriptor(field, desc_name, index)
|
||||
fields = [self._MakeFieldDescriptor(field, desc_name, index, file_desc)
|
||||
for index, field in enumerate(desc_proto.field)]
|
||||
extensions = [
|
||||
self._MakeFieldDescriptor(extension, desc_name, index,
|
||||
self._MakeFieldDescriptor(extension, desc_name, index, file_desc,
|
||||
is_extension=True)
|
||||
for index, extension in enumerate(desc_proto.extension)]
|
||||
oneofs = [
|
||||
@@ -708,7 +722,7 @@ class DescriptorPool(object):
|
||||
return desc
|
||||
|
||||
def _MakeFieldDescriptor(self, field_proto, message_name, index,
|
||||
is_extension=False):
|
||||
file_desc, is_extension=False):
|
||||
"""Creates a field descriptor from a FieldDescriptorProto.
|
||||
|
||||
For message and enum type fields, this method will do a look up
|
||||
@@ -721,6 +735,7 @@ class DescriptorPool(object):
|
||||
field_proto: The proto describing the field.
|
||||
message_name: The name of the containing message.
|
||||
index: Index of the field
|
||||
file_desc: The file containing the field descriptor.
|
||||
is_extension: Indication that this field is for an extension.
|
||||
|
||||
Returns:
|
||||
@@ -747,7 +762,8 @@ class DescriptorPool(object):
|
||||
default_value=None,
|
||||
is_extension=is_extension,
|
||||
extension_scope=None,
|
||||
options=_OptionsOrNone(field_proto))
|
||||
options=_OptionsOrNone(field_proto),
|
||||
file=file_desc)
|
||||
|
||||
def _SetAllFieldTypes(self, package, desc_proto, scope):
|
||||
"""Sets all the descriptor's fields's types.
|
||||
|
||||
@@ -38,14 +38,14 @@ _DURATION = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nanos', full_name='google.protobuf.Duration.nanos', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -38,7 +38,7 @@ _FIELDMASK = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -39,6 +39,7 @@ import "google/protobuf/any.proto";
|
||||
message TestAny {
|
||||
optional google.protobuf.Any value = 1;
|
||||
optional int32 int_value = 2;
|
||||
map<string,int32> map_value = 3;
|
||||
extensions 10 to max;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,13 +20,50 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/any_test.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_pb=_b('\n\'google/protobuf/internal/any_test.proto\x12\x18google.protobuf.internal\x1a\x19google/protobuf/any.proto\"K\n\x07TestAny\x12#\n\x05value\x18\x01 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x11\n\tint_value\x18\x02 \x01(\x05*\x08\x08\n\x10\x80\x80\x80\x80\x02\"\x85\x01\n\x11TestAnyExtension1\x12\t\n\x01i\x18\x0f \x01(\x05\x32\x65\n\nextension1\x12!.google.protobuf.internal.TestAny\x18\xab\xff\xf6. \x01(\x0b\x32+.google.protobuf.internal.TestAnyExtension1')
|
||||
serialized_pb=_b('\n\'google/protobuf/internal/any_test.proto\x12\x18google.protobuf.internal\x1a\x19google/protobuf/any.proto\"\xc0\x01\n\x07TestAny\x12#\n\x05value\x18\x01 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x11\n\tint_value\x18\x02 \x01(\x05\x12\x42\n\tmap_value\x18\x03 \x03(\x0b\x32/.google.protobuf.internal.TestAny.MapValueEntry\x1a/\n\rMapValueEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01*\x08\x08\n\x10\x80\x80\x80\x80\x02\"\x85\x01\n\x11TestAnyExtension1\x12\t\n\x01i\x18\x0f \x01(\x05\x32\x65\n\nextension1\x12!.google.protobuf.internal.TestAny\x18\xab\xff\xf6. \x01(\x0b\x32+.google.protobuf.internal.TestAnyExtension1')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,])
|
||||
|
||||
|
||||
|
||||
|
||||
_TESTANY_MAPVALUEENTRY = _descriptor.Descriptor(
|
||||
name='MapValueEntry',
|
||||
full_name='google.protobuf.internal.TestAny.MapValueEntry',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='key', full_name='google.protobuf.internal.TestAny.MapValueEntry.key', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.internal.TestAny.MapValueEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=232,
|
||||
serialized_end=279,
|
||||
)
|
||||
|
||||
_TESTANY = _descriptor.Descriptor(
|
||||
name='TestAny',
|
||||
full_name='google.protobuf.internal.TestAny',
|
||||
@@ -40,18 +77,25 @@ _TESTANY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int_value', full_name='google.protobuf.internal.TestAny.int_value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='map_value', full_name='google.protobuf.internal.TestAny.map_value', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
nested_types=[_TESTANY_MAPVALUEENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
@@ -60,8 +104,8 @@ _TESTANY = _descriptor.Descriptor(
|
||||
extension_ranges=[(10, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=96,
|
||||
serialized_end=171,
|
||||
serialized_start=97,
|
||||
serialized_end=289,
|
||||
)
|
||||
|
||||
|
||||
@@ -78,7 +122,7 @@ _TESTANYEXTENSION1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -87,7 +131,7 @@ _TESTANYEXTENSION1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -98,21 +142,31 @@ _TESTANYEXTENSION1 = _descriptor.Descriptor(
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=174,
|
||||
serialized_end=307,
|
||||
serialized_start=292,
|
||||
serialized_end=425,
|
||||
)
|
||||
|
||||
_TESTANY_MAPVALUEENTRY.containing_type = _TESTANY
|
||||
_TESTANY.fields_by_name['value'].message_type = google_dot_protobuf_dot_any__pb2._ANY
|
||||
_TESTANY.fields_by_name['map_value'].message_type = _TESTANY_MAPVALUEENTRY
|
||||
DESCRIPTOR.message_types_by_name['TestAny'] = _TESTANY
|
||||
DESCRIPTOR.message_types_by_name['TestAnyExtension1'] = _TESTANYEXTENSION1
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestAny = _reflection.GeneratedProtocolMessageType('TestAny', (_message.Message,), dict(
|
||||
|
||||
MapValueEntry = _reflection.GeneratedProtocolMessageType('MapValueEntry', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTANY_MAPVALUEENTRY,
|
||||
__module__ = 'google.protobuf.internal.any_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestAny.MapValueEntry)
|
||||
))
|
||||
,
|
||||
DESCRIPTOR = _TESTANY,
|
||||
__module__ = 'google.protobuf.internal.any_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestAny)
|
||||
))
|
||||
_sym_db.RegisterMessage(TestAny)
|
||||
_sym_db.RegisterMessage(TestAny.MapValueEntry)
|
||||
|
||||
TestAnyExtension1 = _reflection.GeneratedProtocolMessageType('TestAnyExtension1', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTANYEXTENSION1,
|
||||
@@ -124,4 +178,6 @@ _sym_db.RegisterMessage(TestAnyExtension1)
|
||||
_TESTANYEXTENSION1.extensions_by_name['extension1'].message_type = _TESTANYEXTENSION1
|
||||
TestAny.RegisterExtension(_TESTANYEXTENSION1.extensions_by_name['extension1'])
|
||||
|
||||
_TESTANY_MAPVALUEENTRY.has_options = True
|
||||
_TESTANY_MAPVALUEENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -61,10 +61,15 @@ if _api_version < 0: # Still unspecified?
|
||||
del _use_fast_cpp_protos
|
||||
_api_version = 2
|
||||
except ImportError:
|
||||
if _proto_extension_modules_exist_in_build:
|
||||
if sys.version_info[0] >= 3: # Python 3 defaults to C++ impl v2.
|
||||
_api_version = 2
|
||||
# TODO(b/17427486): Make Python 2 default to C++ impl v2.
|
||||
try:
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf.internal import use_pure_python
|
||||
del use_pure_python # Avoids a pylint error and namespace pollution.
|
||||
except ImportError:
|
||||
if _proto_extension_modules_exist_in_build:
|
||||
if sys.version_info[0] >= 3: # Python 3 defaults to C++ impl v2.
|
||||
_api_version = 2
|
||||
# TODO(b/17427486): Make Python 2 default to C++ impl v2.
|
||||
|
||||
_default_implementation_type = (
|
||||
'python' if _api_version <= 0 else 'cpp')
|
||||
@@ -100,6 +105,27 @@ if _implementation_version_str != '2':
|
||||
_implementation_version = int(_implementation_version_str)
|
||||
|
||||
|
||||
# Detect if serialization should be deterministic by default
|
||||
try:
|
||||
# The presence of this module in a build allows the proto implementation to
|
||||
# be upgraded merely via build deps.
|
||||
#
|
||||
# NOTE: Merely importing this automatically enables deterministic proto
|
||||
# serialization for C++ code, but we still need to export it as a boolean so
|
||||
# that we can do the same for `_implementation_type == 'python'`.
|
||||
#
|
||||
# NOTE2: It is possible for C++ code to enable deterministic serialization by
|
||||
# default _without_ affecting Python code, if the C++ implementation is not in
|
||||
# use by this module. That is intended behavior, so we don't actually expose
|
||||
# this boolean outside of this module.
|
||||
#
|
||||
# pylint: disable=g-import-not-at-top,unused-import
|
||||
from google.protobuf import enable_deterministic_proto_serialization
|
||||
_python_deterministic_proto_serialization = True
|
||||
except ImportError:
|
||||
_python_deterministic_proto_serialization = False
|
||||
|
||||
|
||||
# Usage of this function is discouraged. Clients shouldn't care which
|
||||
# implementation of the API is in use. Note that there is no guarantee
|
||||
# that differences between APIs will be maintained.
|
||||
@@ -111,3 +137,34 @@ def Type():
|
||||
# See comment on 'Type' above.
|
||||
def Version():
|
||||
return _implementation_version
|
||||
|
||||
|
||||
# For internal use only
|
||||
def IsPythonDefaultSerializationDeterministic():
|
||||
return _python_deterministic_proto_serialization
|
||||
|
||||
# DO NOT USE: For migration and testing only. Will be removed when Proto3
|
||||
# defaults to preserve unknowns.
|
||||
if _implementation_type == 'cpp':
|
||||
try:
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf.pyext import _message
|
||||
|
||||
def GetPythonProto3PreserveUnknownsDefault():
|
||||
return _message.GetPythonProto3PreserveUnknownsDefault()
|
||||
|
||||
def SetPythonProto3PreserveUnknownsDefault(preserve):
|
||||
_message.SetPythonProto3PreserveUnknownsDefault(preserve)
|
||||
except ImportError:
|
||||
# Unrecognized cpp implementation. Skipping the unknown fields APIs.
|
||||
pass
|
||||
else:
|
||||
_python_proto3_preserve_unknowns_default = True
|
||||
|
||||
def GetPythonProto3PreserveUnknownsDefault():
|
||||
return _python_proto3_preserve_unknowns_default
|
||||
|
||||
def SetPythonProto3PreserveUnknownsDefault(preserve):
|
||||
global _python_proto3_preserve_unknowns_default
|
||||
_python_proto3_preserve_unknowns_default = preserve
|
||||
|
||||
@@ -181,7 +181,7 @@ def ReadTag(buffer, pos):
|
||||
while six.indexbytes(buffer, pos) & 0x80:
|
||||
pos += 1
|
||||
pos += 1
|
||||
return (buffer[start:pos], pos)
|
||||
return (six.binary_type(buffer[start:pos]), pos)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
|
||||
@@ -39,6 +39,7 @@ try:
|
||||
except ImportError:
|
||||
import unittest
|
||||
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import descriptor_pb2
|
||||
from google.protobuf.internal import factory_test2_pb2
|
||||
from google.protobuf import descriptor_database
|
||||
@@ -54,16 +55,49 @@ class DescriptorDatabaseTest(unittest.TestCase):
|
||||
|
||||
self.assertEqual(file_desc_proto, db.FindFileByName(
|
||||
'google/protobuf/internal/factory_test2.proto'))
|
||||
# Can find message type.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Message'))
|
||||
# Can find nested message type.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Message.NestedFactory2Message'))
|
||||
# Can find enum type.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Enum'))
|
||||
# Can find nested enum type.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Message.NestedFactory2Enum'))
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.MessageWithNestedEnumOnly.NestedEnum'))
|
||||
# Can find field.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Message.list_field'))
|
||||
# Can find enum value.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Enum.FACTORY_2_VALUE_0'))
|
||||
# Can find top level extension.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.another_field'))
|
||||
# Can find nested extension inside a message.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Message.one_more_field'))
|
||||
|
||||
# Can find service.
|
||||
file_desc_proto2 = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb)
|
||||
db.Add(file_desc_proto2)
|
||||
self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestService'))
|
||||
|
||||
# Non-existent field under a valid top level symbol can also be
|
||||
# found. The behavior is the same with protobuf C++.
|
||||
self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestAllTypes.none_field'))
|
||||
|
||||
self.assertRaises(KeyError,
|
||||
db.FindFileContainingSymbol,
|
||||
'protobuf_unittest.NoneMessage')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -60,26 +60,8 @@ from google.protobuf import message_factory
|
||||
from google.protobuf import symbol_database
|
||||
|
||||
|
||||
class DescriptorPoolTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
# TODO(jieluo): Should make the pool which is created by
|
||||
# serialized_pb same with generated pool.
|
||||
# TODO(jieluo): More test coverage for the generated pool.
|
||||
self.pool = descriptor_pool.DescriptorPool()
|
||||
self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.pool.Add(self.factory_test1_fd)
|
||||
self.pool.Add(self.factory_test2_fd)
|
||||
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb))
|
||||
class DescriptorPoolTestBase(object):
|
||||
|
||||
def testFindFileByName(self):
|
||||
name1 = 'google/protobuf/internal/factory_test1.proto'
|
||||
@@ -131,11 +113,11 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
self.assertEqual('google/protobuf/internal/factory_test2.proto',
|
||||
file_desc4.name)
|
||||
|
||||
# Tests the generated pool.
|
||||
assert descriptor_pool.Default().FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Message.one_more_field')
|
||||
assert descriptor_pool.Default().FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.another_field')
|
||||
file_desc5 = self.pool.FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestService')
|
||||
self.assertIsInstance(file_desc5, descriptor.FileDescriptor)
|
||||
self.assertEqual('google/protobuf/unittest.proto',
|
||||
file_desc5.name)
|
||||
|
||||
def testFindFileContainingSymbolFailure(self):
|
||||
with self.assertRaises(KeyError):
|
||||
@@ -223,6 +205,27 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
msg2.fields_by_name[name].containing_oneof)
|
||||
self.assertIn(msg2.fields_by_name[name], msg2.oneofs[0].fields)
|
||||
|
||||
def testFindTypeErrors(self):
|
||||
self.assertRaises(TypeError, self.pool.FindExtensionByNumber, '')
|
||||
|
||||
# TODO(jieluo): Fix python to raise correct errors.
|
||||
if api_implementation.Type() == 'cpp':
|
||||
self.assertRaises(TypeError, self.pool.FindMethodByName, 0)
|
||||
self.assertRaises(KeyError, self.pool.FindMethodByName, '')
|
||||
error_type = TypeError
|
||||
else:
|
||||
error_type = AttributeError
|
||||
self.assertRaises(error_type, self.pool.FindMessageTypeByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindFieldByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindExtensionByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindEnumTypeByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindOneofByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindServiceByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindFileContainingSymbol, 0)
|
||||
if api_implementation.Type() == 'python':
|
||||
error_type = KeyError
|
||||
self.assertRaises(error_type, self.pool.FindFileByName, 0)
|
||||
|
||||
def testFindMessageTypeByNameFailure(self):
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindMessageTypeByName('Does not exist')
|
||||
@@ -262,6 +265,11 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
self.pool.FindEnumTypeByName('Does not exist')
|
||||
|
||||
def testFindFieldByName(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix cpp extension to find field correctly
|
||||
# when descriptor pool is using an underlying database.
|
||||
return
|
||||
field = self.pool.FindFieldByName(
|
||||
'google.protobuf.python.internal.Factory1Message.list_value')
|
||||
self.assertEqual(field.name, 'list_value')
|
||||
@@ -271,7 +279,24 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindFieldByName('Does not exist')
|
||||
|
||||
def testFindOneofByName(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix cpp extension to find oneof correctly
|
||||
# when descriptor pool is using an underlying database.
|
||||
return
|
||||
oneof = self.pool.FindOneofByName(
|
||||
'google.protobuf.python.internal.Factory2Message.oneof_field')
|
||||
self.assertEqual(oneof.name, 'oneof_field')
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindOneofByName('Does not exist')
|
||||
|
||||
def testFindExtensionByName(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix cpp extension to find extension correctly
|
||||
# when descriptor pool is using an underlying database.
|
||||
return
|
||||
# An extension defined in a message.
|
||||
extension = self.pool.FindExtensionByName(
|
||||
'google.protobuf.python.internal.Factory2Message.one_more_field')
|
||||
@@ -344,6 +369,8 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
def testFindService(self):
|
||||
service = self.pool.FindServiceByName('protobuf_unittest.TestService')
|
||||
self.assertEqual(service.full_name, 'protobuf_unittest.TestService')
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindServiceByName('Does not exist')
|
||||
|
||||
def testUserDefinedDB(self):
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
@@ -353,24 +380,17 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
self.testFindMessageTypeByName()
|
||||
|
||||
def testAddSerializedFile(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# Cpp extension cannot call Add on a DescriptorPool
|
||||
# that uses a DescriptorDatabase.
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
return
|
||||
self.pool = descriptor_pool.DescriptorPool()
|
||||
self.pool.AddSerializedFile(self.factory_test1_fd.SerializeToString())
|
||||
self.pool.AddSerializedFile(self.factory_test2_fd.SerializeToString())
|
||||
self.testFindMessageTypeByName()
|
||||
|
||||
def testComplexNesting(self):
|
||||
more_messages_desc = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
more_messages_pb2.DESCRIPTOR.serialized_pb)
|
||||
test1_desc = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
descriptor_pool_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
test2_desc = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
descriptor_pool_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.pool.Add(more_messages_desc)
|
||||
self.pool.Add(test1_desc)
|
||||
self.pool.Add(test2_desc)
|
||||
TEST1_FILE.CheckFile(self, self.pool)
|
||||
TEST2_FILE.CheckFile(self, self.pool)
|
||||
|
||||
|
||||
def testEnumDefaultValue(self):
|
||||
"""Test the default value of enums which don't start at zero."""
|
||||
@@ -389,6 +409,12 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
self.assertIs(file_descriptor, descriptor_pool_test1_pb2.DESCRIPTOR)
|
||||
_CheckDefaultValue(file_descriptor)
|
||||
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# Cpp extension cannot call Add on a DescriptorPool
|
||||
# that uses a DescriptorDatabase.
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
return
|
||||
# Then check the dynamic pool and its internal DescriptorDatabase.
|
||||
descriptor_proto = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
descriptor_pool_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
@@ -436,6 +462,110 @@ class DescriptorPoolTest(unittest.TestCase):
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR.full_name))
|
||||
_CheckDefaultValues(message_class())
|
||||
|
||||
def testAddFileDescriptor(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# Cpp extension cannot call Add on a DescriptorPool
|
||||
# that uses a DescriptorDatabase.
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
return
|
||||
file_desc = descriptor_pb2.FileDescriptorProto(name='some/file.proto')
|
||||
self.pool.Add(file_desc)
|
||||
self.pool.AddSerializedFile(file_desc.SerializeToString())
|
||||
|
||||
def testComplexNesting(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# Cpp extension cannot call Add on a DescriptorPool
|
||||
# that uses a DescriptorDatabase.
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
return
|
||||
more_messages_desc = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
more_messages_pb2.DESCRIPTOR.serialized_pb)
|
||||
test1_desc = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
descriptor_pool_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
test2_desc = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
descriptor_pool_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.pool.Add(more_messages_desc)
|
||||
self.pool.Add(test1_desc)
|
||||
self.pool.Add(test2_desc)
|
||||
TEST1_FILE.CheckFile(self, self.pool)
|
||||
TEST2_FILE.CheckFile(self, self.pool)
|
||||
|
||||
|
||||
class DefaultDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.pool = descriptor_pool.Default()
|
||||
self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
|
||||
def testFindMethods(self):
|
||||
self.assertIs(
|
||||
self.pool.FindFileByName('google/protobuf/unittest.proto'),
|
||||
unittest_pb2.DESCRIPTOR)
|
||||
self.assertIs(
|
||||
self.pool.FindMessageTypeByName('protobuf_unittest.TestAllTypes'),
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR)
|
||||
self.assertIs(
|
||||
self.pool.FindFieldByName(
|
||||
'protobuf_unittest.TestAllTypes.optional_int32'),
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR.fields_by_name['optional_int32'])
|
||||
self.assertIs(
|
||||
self.pool.FindEnumTypeByName('protobuf_unittest.ForeignEnum'),
|
||||
unittest_pb2.ForeignEnum.DESCRIPTOR)
|
||||
self.assertIs(
|
||||
self.pool.FindExtensionByName(
|
||||
'protobuf_unittest.optional_int32_extension'),
|
||||
unittest_pb2.DESCRIPTOR.extensions_by_name['optional_int32_extension'])
|
||||
self.assertIs(
|
||||
self.pool.FindOneofByName('protobuf_unittest.TestAllTypes.oneof_field'),
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR.oneofs_by_name['oneof_field'])
|
||||
self.assertIs(
|
||||
self.pool.FindServiceByName('protobuf_unittest.TestService'),
|
||||
unittest_pb2.DESCRIPTOR.services_by_name['TestService'])
|
||||
|
||||
|
||||
class CreateDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.pool = descriptor_pool.DescriptorPool()
|
||||
self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.pool.Add(self.factory_test1_fd)
|
||||
self.pool.Add(self.factory_test2_fd)
|
||||
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb))
|
||||
|
||||
|
||||
class SecondaryDescriptorFromDescriptorDB(DescriptorPoolTestBase,
|
||||
unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
db.Add(self.factory_test1_fd)
|
||||
db.Add(self.factory_test2_fd)
|
||||
db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
|
||||
db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_pb2.DESCRIPTOR.serialized_pb))
|
||||
db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool = descriptor_pool.DescriptorPool(descriptor_db=db)
|
||||
|
||||
|
||||
class ProtoFile(object):
|
||||
|
||||
@@ -506,10 +636,10 @@ class MessageType(object):
|
||||
subtype.CheckType(test, desc, name, file_desc)
|
||||
|
||||
for index, (name, field) in enumerate(self.field_list):
|
||||
field.CheckField(test, desc, name, index)
|
||||
field.CheckField(test, desc, name, index, file_desc)
|
||||
|
||||
for index, (name, field) in enumerate(self.extensions):
|
||||
field.CheckField(test, desc, name, index)
|
||||
field.CheckField(test, desc, name, index, file_desc)
|
||||
|
||||
|
||||
class EnumField(object):
|
||||
@@ -519,7 +649,7 @@ class EnumField(object):
|
||||
self.type_name = type_name
|
||||
self.default_value = default_value
|
||||
|
||||
def CheckField(self, test, msg_desc, name, index):
|
||||
def CheckField(self, test, msg_desc, name, index, file_desc):
|
||||
field_desc = msg_desc.fields_by_name[name]
|
||||
enum_desc = msg_desc.enum_types_by_name[self.type_name]
|
||||
test.assertEqual(name, field_desc.name)
|
||||
@@ -536,6 +666,7 @@ class EnumField(object):
|
||||
test.assertFalse(enum_desc.values_by_name[self.default_value].has_options)
|
||||
test.assertEqual(msg_desc, field_desc.containing_type)
|
||||
test.assertEqual(enum_desc, field_desc.enum_type)
|
||||
test.assertEqual(file_desc, enum_desc.file)
|
||||
|
||||
|
||||
class MessageField(object):
|
||||
@@ -544,7 +675,7 @@ class MessageField(object):
|
||||
self.number = number
|
||||
self.type_name = type_name
|
||||
|
||||
def CheckField(self, test, msg_desc, name, index):
|
||||
def CheckField(self, test, msg_desc, name, index, file_desc):
|
||||
field_desc = msg_desc.fields_by_name[name]
|
||||
field_type_desc = msg_desc.nested_types_by_name[self.type_name]
|
||||
test.assertEqual(name, field_desc.name)
|
||||
@@ -558,6 +689,12 @@ class MessageField(object):
|
||||
test.assertFalse(field_desc.has_default_value)
|
||||
test.assertEqual(msg_desc, field_desc.containing_type)
|
||||
test.assertEqual(field_type_desc, field_desc.message_type)
|
||||
test.assertEqual(file_desc, field_desc.file)
|
||||
# TODO(jieluo): Fix python and cpp extension diff for message field
|
||||
# default value.
|
||||
if api_implementation.Type() == 'cpp':
|
||||
test.assertRaises(
|
||||
NotImplementedError, getattr, field_desc, 'default_value')
|
||||
|
||||
|
||||
class StringField(object):
|
||||
@@ -566,7 +703,7 @@ class StringField(object):
|
||||
self.number = number
|
||||
self.default_value = default_value
|
||||
|
||||
def CheckField(self, test, msg_desc, name, index):
|
||||
def CheckField(self, test, msg_desc, name, index, file_desc):
|
||||
field_desc = msg_desc.fields_by_name[name]
|
||||
test.assertEqual(name, field_desc.name)
|
||||
expected_field_full_name = '.'.join([msg_desc.full_name, name])
|
||||
@@ -578,6 +715,7 @@ class StringField(object):
|
||||
field_desc.cpp_type)
|
||||
test.assertTrue(field_desc.has_default_value)
|
||||
test.assertEqual(self.default_value, field_desc.default_value)
|
||||
test.assertEqual(file_desc, field_desc.file)
|
||||
|
||||
|
||||
class ExtensionField(object):
|
||||
@@ -586,7 +724,7 @@ class ExtensionField(object):
|
||||
self.number = number
|
||||
self.extended_type = extended_type
|
||||
|
||||
def CheckField(self, test, msg_desc, name, index):
|
||||
def CheckField(self, test, msg_desc, name, index, file_desc):
|
||||
field_desc = msg_desc.extensions_by_name[name]
|
||||
test.assertEqual(name, field_desc.name)
|
||||
expected_field_full_name = '.'.join([msg_desc.full_name, name])
|
||||
@@ -601,6 +739,7 @@ class ExtensionField(object):
|
||||
test.assertEqual(msg_desc, field_desc.extension_scope)
|
||||
test.assertEqual(msg_desc, field_desc.message_type)
|
||||
test.assertEqual(self.extended_type, field_desc.containing_type.name)
|
||||
test.assertEqual(file_desc, field_desc.file)
|
||||
|
||||
|
||||
class AddDescriptorTest(unittest.TestCase):
|
||||
@@ -727,6 +866,25 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
'some/file.proto')
|
||||
self.assertEqual(pool.FindMessageTypeByName('package.Message').name,
|
||||
'Message')
|
||||
# Test no package
|
||||
file_proto = descriptor_pb2.FileDescriptorProto(
|
||||
name='some/filename/container.proto')
|
||||
message_proto = file_proto.message_type.add(
|
||||
name='TopMessage')
|
||||
message_proto.field.add(
|
||||
name='bb',
|
||||
number=1,
|
||||
type=descriptor_pb2.FieldDescriptorProto.TYPE_INT32,
|
||||
label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL)
|
||||
enum_proto = file_proto.enum_type.add(name='TopEnum')
|
||||
enum_proto.value.add(name='FOREIGN_FOO', number=4)
|
||||
file_proto.service.add(name='TopService')
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
pool.Add(file_proto)
|
||||
self.assertEqual('TopMessage',
|
||||
pool.FindMessageTypeByName('TopMessage').name)
|
||||
self.assertEqual('TopEnum', pool.FindEnumTypeByName('TopEnum').name)
|
||||
self.assertEqual('TopService', pool.FindServiceByName('TopService').name)
|
||||
|
||||
def testFileDescriptorOptionsWithCustomDescriptorPool(self):
|
||||
# Create a descriptor pool, and add a new FileDescriptorProto to it.
|
||||
@@ -745,42 +903,18 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
# The object returned by GetOptions() is cached.
|
||||
self.assertIs(options, file_descriptor.GetOptions())
|
||||
|
||||
|
||||
@unittest.skipIf(
|
||||
api_implementation.Type() != 'cpp',
|
||||
'default_pool is only supported by the C++ implementation')
|
||||
class DefaultPoolTest(unittest.TestCase):
|
||||
|
||||
def testFindMethods(self):
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf.pyext import _message
|
||||
pool = _message.default_pool
|
||||
self.assertIs(
|
||||
pool.FindFileByName('google/protobuf/unittest.proto'),
|
||||
unittest_pb2.DESCRIPTOR)
|
||||
self.assertIs(
|
||||
pool.FindMessageTypeByName('protobuf_unittest.TestAllTypes'),
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR)
|
||||
self.assertIs(
|
||||
pool.FindFieldByName('protobuf_unittest.TestAllTypes.optional_int32'),
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR.fields_by_name['optional_int32'])
|
||||
self.assertIs(
|
||||
pool.FindExtensionByName('protobuf_unittest.optional_int32_extension'),
|
||||
unittest_pb2.DESCRIPTOR.extensions_by_name['optional_int32_extension'])
|
||||
self.assertIs(
|
||||
pool.FindEnumTypeByName('protobuf_unittest.ForeignEnum'),
|
||||
unittest_pb2.ForeignEnum.DESCRIPTOR)
|
||||
self.assertIs(
|
||||
pool.FindOneofByName('protobuf_unittest.TestAllTypes.oneof_field'),
|
||||
unittest_pb2.TestAllTypes.DESCRIPTOR.oneofs_by_name['oneof_field'])
|
||||
|
||||
def testAddFileDescriptor(self):
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf.pyext import _message
|
||||
pool = _message.default_pool
|
||||
file_desc = descriptor_pb2.FileDescriptorProto(name='some/file.proto')
|
||||
pool.Add(file_desc)
|
||||
pool.AddSerializedFile(file_desc.SerializeToString())
|
||||
def testAddTypeError(self):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddEnumDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddServiceDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddExtensionDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddFileDescriptor(0)
|
||||
|
||||
|
||||
TEST1_FILE = ProtoFile(
|
||||
|
||||
@@ -170,14 +170,14 @@ _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=7,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_field', full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage.nested_field', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("theta").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -208,21 +208,21 @@ _DESCRIPTORPOOLTEST1_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=6,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_field', full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.nested_field', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("beta").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='deep_nested_message', full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.deep_nested_message', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -253,14 +253,14 @@ _DESCRIPTORPOOLTEST1 = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=2,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_message', full_name='google.protobuf.python.internal.DescriptorPoolTest1.nested_message', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -292,14 +292,14 @@ _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=12,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_field', full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage.nested_field', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("lambda").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -330,21 +330,21 @@ _DESCRIPTORPOOLTEST2_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=9,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_field', full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.nested_field', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("delta").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='deep_nested_message', full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.deep_nested_message', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -375,14 +375,14 @@ _DESCRIPTORPOOLTEST2 = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=3,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_message', full_name='google.protobuf.python.internal.DescriptorPoolTest2.nested_message', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -109,14 +109,14 @@ _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=17,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_field', full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage.nested_field', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("sigma").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -147,21 +147,21 @@ _DESCRIPTORPOOLTEST3_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=16,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_field', full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.nested_field', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("nu").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='deep_nested_message', full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.deep_nested_message', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -192,14 +192,14 @@ _DESCRIPTORPOOLTEST3 = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=14,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_message', full_name='google.protobuf.python.internal.DescriptorPoolTest3.nested_message', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -208,7 +208,7 @@ _DESCRIPTORPOOLTEST3 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST3_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
|
||||
@@ -107,6 +107,12 @@ class DescriptorTest(unittest.TestCase):
|
||||
self.my_message.enum_types_by_name[
|
||||
'ForeignEnum'].values_by_number[4].name,
|
||||
self.my_message.EnumValueName('ForeignEnum', 4))
|
||||
with self.assertRaises(KeyError):
|
||||
self.my_message.EnumValueName('ForeignEnum', 999)
|
||||
with self.assertRaises(KeyError):
|
||||
self.my_message.EnumValueName('NoneEnum', 999)
|
||||
with self.assertRaises(TypeError):
|
||||
self.my_message.EnumValueName()
|
||||
|
||||
def testEnumFixups(self):
|
||||
self.assertEqual(self.my_enum, self.my_enum.values[0].type)
|
||||
@@ -134,15 +140,17 @@ class DescriptorTest(unittest.TestCase):
|
||||
|
||||
def testSimpleCustomOptions(self):
|
||||
file_descriptor = unittest_custom_options_pb2.DESCRIPTOR
|
||||
message_descriptor =\
|
||||
unittest_custom_options_pb2.TestMessageWithCustomOptions.DESCRIPTOR
|
||||
message_descriptor = (unittest_custom_options_pb2.
|
||||
TestMessageWithCustomOptions.DESCRIPTOR)
|
||||
field_descriptor = message_descriptor.fields_by_name['field1']
|
||||
oneof_descriptor = message_descriptor.oneofs_by_name['AnOneof']
|
||||
enum_descriptor = message_descriptor.enum_types_by_name['AnEnum']
|
||||
enum_value_descriptor =\
|
||||
message_descriptor.enum_values_by_name['ANENUM_VAL2']
|
||||
service_descriptor =\
|
||||
unittest_custom_options_pb2.TestServiceWithCustomOptions.DESCRIPTOR
|
||||
enum_value_descriptor = (message_descriptor.
|
||||
enum_values_by_name['ANENUM_VAL2'])
|
||||
other_enum_value_descriptor = (message_descriptor.
|
||||
enum_values_by_name['ANENUM_VAL1'])
|
||||
service_descriptor = (unittest_custom_options_pb2.
|
||||
TestServiceWithCustomOptions.DESCRIPTOR)
|
||||
method_descriptor = service_descriptor.FindMethodByName('Foo')
|
||||
|
||||
file_options = file_descriptor.GetOptions()
|
||||
@@ -178,6 +186,11 @@ class DescriptorTest(unittest.TestCase):
|
||||
unittest_custom_options_pb2.DummyMessageContainingEnum.DESCRIPTOR)
|
||||
self.assertTrue(file_descriptor.has_options)
|
||||
self.assertFalse(message_descriptor.has_options)
|
||||
self.assertTrue(field_descriptor.has_options)
|
||||
self.assertTrue(oneof_descriptor.has_options)
|
||||
self.assertTrue(enum_descriptor.has_options)
|
||||
self.assertTrue(enum_value_descriptor.has_options)
|
||||
self.assertFalse(other_enum_value_descriptor.has_options)
|
||||
|
||||
def testDifferentCustomOptionTypes(self):
|
||||
kint32min = -2**31
|
||||
@@ -400,6 +413,12 @@ class DescriptorTest(unittest.TestCase):
|
||||
self.assertEqual(self.my_file.name, 'some/filename/some.proto')
|
||||
self.assertEqual(self.my_file.package, 'protobuf_unittest')
|
||||
self.assertEqual(self.my_file.pool, self.pool)
|
||||
self.assertFalse(self.my_file.has_options)
|
||||
self.assertEqual('proto2', self.my_file.syntax)
|
||||
file_proto = descriptor_pb2.FileDescriptorProto()
|
||||
self.my_file.CopyToProto(file_proto)
|
||||
self.assertEqual(self.my_file.serialized_pb,
|
||||
file_proto.SerializeToString())
|
||||
# Generated modules also belong to the default pool.
|
||||
self.assertEqual(unittest_pb2.DESCRIPTOR.pool, descriptor_pool.Default())
|
||||
|
||||
@@ -407,13 +426,31 @@ class DescriptorTest(unittest.TestCase):
|
||||
api_implementation.Type() != 'cpp' or api_implementation.Version() != 2,
|
||||
'Immutability of descriptors is only enforced in v2 implementation')
|
||||
def testImmutableCppDescriptor(self):
|
||||
file_descriptor = unittest_pb2.DESCRIPTOR
|
||||
message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
field_descriptor = message_descriptor.fields_by_name['optional_int32']
|
||||
enum_descriptor = message_descriptor.enum_types_by_name['NestedEnum']
|
||||
oneof_descriptor = message_descriptor.oneofs_by_name['oneof_field']
|
||||
with self.assertRaises(AttributeError):
|
||||
message_descriptor.fields_by_name = None
|
||||
with self.assertRaises(TypeError):
|
||||
message_descriptor.fields_by_name['Another'] = None
|
||||
with self.assertRaises(TypeError):
|
||||
message_descriptor.fields.append(None)
|
||||
with self.assertRaises(AttributeError):
|
||||
field_descriptor.containing_type = message_descriptor
|
||||
with self.assertRaises(AttributeError):
|
||||
file_descriptor.has_options = False
|
||||
with self.assertRaises(AttributeError):
|
||||
field_descriptor.has_options = False
|
||||
with self.assertRaises(AttributeError):
|
||||
oneof_descriptor.has_options = False
|
||||
with self.assertRaises(AttributeError):
|
||||
enum_descriptor.has_options = False
|
||||
with self.assertRaises(AttributeError) as e:
|
||||
message_descriptor.has_options = True
|
||||
self.assertEqual('attribute is not writable: has_options',
|
||||
str(e.exception))
|
||||
|
||||
|
||||
class NewDescriptorTest(DescriptorTest):
|
||||
@@ -442,6 +479,12 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
self.CheckDescriptorMapping(message_descriptor.fields_by_name)
|
||||
self.CheckDescriptorMapping(message_descriptor.fields_by_number)
|
||||
self.CheckDescriptorMapping(message_descriptor.fields_by_camelcase_name)
|
||||
self.CheckDescriptorMapping(message_descriptor.enum_types_by_name)
|
||||
self.CheckDescriptorMapping(message_descriptor.enum_values_by_name)
|
||||
self.CheckDescriptorMapping(message_descriptor.oneofs_by_name)
|
||||
self.CheckDescriptorMapping(message_descriptor.enum_types[0].values_by_name)
|
||||
# Test extension range
|
||||
self.assertEqual(message_descriptor.extension_ranges, [])
|
||||
|
||||
def CheckFieldDescriptor(self, field_descriptor):
|
||||
# Basic properties
|
||||
@@ -450,6 +493,7 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
self.assertEqual(field_descriptor.full_name,
|
||||
'protobuf_unittest.TestAllTypes.optional_int32')
|
||||
self.assertEqual(field_descriptor.containing_type.name, 'TestAllTypes')
|
||||
self.assertEqual(field_descriptor.file, unittest_pb2.DESCRIPTOR)
|
||||
# Test equality and hashability
|
||||
self.assertEqual(field_descriptor, field_descriptor)
|
||||
self.assertEqual(
|
||||
@@ -461,32 +505,73 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
field_descriptor)
|
||||
self.assertIn(field_descriptor, [field_descriptor])
|
||||
self.assertIn(field_descriptor, {field_descriptor: None})
|
||||
self.assertEqual(None, field_descriptor.extension_scope)
|
||||
self.assertEqual(None, field_descriptor.enum_type)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# For test coverage only
|
||||
self.assertEqual(field_descriptor.id, field_descriptor.id)
|
||||
|
||||
def CheckDescriptorSequence(self, sequence):
|
||||
# Verifies that a property like 'messageDescriptor.fields' has all the
|
||||
# properties of an immutable abc.Sequence.
|
||||
self.assertNotEqual(sequence,
|
||||
unittest_pb2.TestAllExtensions.DESCRIPTOR.fields)
|
||||
self.assertNotEqual(sequence, [])
|
||||
self.assertNotEqual(sequence, 1)
|
||||
self.assertFalse(sequence == 1) # Only for cpp test coverage
|
||||
self.assertEqual(sequence, sequence)
|
||||
expected_list = list(sequence)
|
||||
self.assertEqual(expected_list, sequence)
|
||||
self.assertGreater(len(sequence), 0) # Sized
|
||||
self.assertEqual(len(sequence), len(list(sequence))) # Iterable
|
||||
self.assertEqual(len(sequence), len(expected_list)) # Iterable
|
||||
self.assertEqual(sequence[len(sequence) -1], sequence[-1])
|
||||
item = sequence[0]
|
||||
self.assertEqual(item, sequence[0])
|
||||
self.assertIn(item, sequence) # Container
|
||||
self.assertEqual(sequence.index(item), 0)
|
||||
self.assertEqual(sequence.count(item), 1)
|
||||
other_item = unittest_pb2.NestedTestAllTypes.DESCRIPTOR.fields[0]
|
||||
self.assertNotIn(other_item, sequence)
|
||||
self.assertEqual(sequence.count(other_item), 0)
|
||||
self.assertRaises(ValueError, sequence.index, other_item)
|
||||
self.assertRaises(ValueError, sequence.index, [])
|
||||
reversed_iterator = reversed(sequence)
|
||||
self.assertEqual(list(reversed_iterator), list(sequence)[::-1])
|
||||
self.assertRaises(StopIteration, next, reversed_iterator)
|
||||
expected_list[0] = 'change value'
|
||||
self.assertNotEqual(expected_list, sequence)
|
||||
# TODO(jieluo): Change __repr__ support for DescriptorSequence.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertEqual(str(list(sequence)), str(sequence))
|
||||
else:
|
||||
self.assertEqual(str(sequence)[0], '<')
|
||||
|
||||
def CheckDescriptorMapping(self, mapping):
|
||||
# Verifies that a property like 'messageDescriptor.fields' has all the
|
||||
# properties of an immutable abc.Mapping.
|
||||
self.assertNotEqual(
|
||||
mapping, unittest_pb2.TestAllExtensions.DESCRIPTOR.fields_by_name)
|
||||
self.assertNotEqual(mapping, {})
|
||||
self.assertNotEqual(mapping, 1)
|
||||
self.assertFalse(mapping == 1) # Only for cpp test coverage
|
||||
excepted_dict = dict(mapping.items())
|
||||
self.assertEqual(mapping, excepted_dict)
|
||||
self.assertEqual(mapping, mapping)
|
||||
self.assertGreater(len(mapping), 0) # Sized
|
||||
self.assertEqual(len(mapping), len(list(mapping))) # Iterable
|
||||
self.assertEqual(len(mapping), len(excepted_dict)) # Iterable
|
||||
if sys.version_info >= (3,):
|
||||
key, item = next(iter(mapping.items()))
|
||||
else:
|
||||
key, item = mapping.items()[0]
|
||||
self.assertIn(key, mapping) # Container
|
||||
self.assertEqual(mapping.get(key), item)
|
||||
with self.assertRaises(TypeError):
|
||||
mapping.get()
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertRaises(TypeError, mapping.get, [])
|
||||
else:
|
||||
self.assertEqual(None, mapping.get([]))
|
||||
# keys(), iterkeys() &co
|
||||
item = (next(iter(mapping.keys())), next(iter(mapping.values())))
|
||||
self.assertEqual(item, next(iter(mapping.items())))
|
||||
@@ -497,6 +582,18 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
CheckItems(mapping.keys(), mapping.iterkeys())
|
||||
CheckItems(mapping.values(), mapping.itervalues())
|
||||
CheckItems(mapping.items(), mapping.iteritems())
|
||||
excepted_dict[key] = 'change value'
|
||||
self.assertNotEqual(mapping, excepted_dict)
|
||||
del excepted_dict[key]
|
||||
excepted_dict['new_key'] = 'new'
|
||||
self.assertNotEqual(mapping, excepted_dict)
|
||||
self.assertRaises(KeyError, mapping.__getitem__, 'key_error')
|
||||
self.assertRaises(KeyError, mapping.__getitem__, len(mapping) + 1)
|
||||
# TODO(jieluo): Add __repr__ support for DescriptorMapping.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertEqual(len(str(dict(mapping.items()))), len(str(mapping)))
|
||||
else:
|
||||
self.assertEqual(str(mapping)[0], '<')
|
||||
|
||||
def testDescriptor(self):
|
||||
message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
@@ -506,13 +603,26 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
field_descriptor = message_descriptor.fields_by_camelcase_name[
|
||||
'optionalInt32']
|
||||
self.CheckFieldDescriptor(field_descriptor)
|
||||
enum_descriptor = unittest_pb2.DESCRIPTOR.enum_types_by_name[
|
||||
'ForeignEnum']
|
||||
self.assertEqual(None, enum_descriptor.containing_type)
|
||||
# Test extension range
|
||||
self.assertEqual(
|
||||
unittest_pb2.TestAllExtensions.DESCRIPTOR.extension_ranges,
|
||||
[(1, 536870912)])
|
||||
self.assertEqual(
|
||||
unittest_pb2.TestMultipleExtensionRanges.DESCRIPTOR.extension_ranges,
|
||||
[(42, 43), (4143, 4244), (65536, 536870912)])
|
||||
|
||||
def testCppDescriptorContainer(self):
|
||||
# Check that the collection is still valid even if the parent disappeared.
|
||||
enum = unittest_pb2.TestAllTypes.DESCRIPTOR.enum_types_by_name['NestedEnum']
|
||||
values = enum.values
|
||||
del enum
|
||||
self.assertEqual('FOO', values[0].name)
|
||||
containing_file = unittest_pb2.DESCRIPTOR
|
||||
self.CheckDescriptorSequence(containing_file.dependencies)
|
||||
self.CheckDescriptorMapping(containing_file.message_types_by_name)
|
||||
self.CheckDescriptorMapping(containing_file.enum_types_by_name)
|
||||
self.CheckDescriptorMapping(containing_file.services_by_name)
|
||||
self.CheckDescriptorMapping(containing_file.extensions_by_name)
|
||||
self.CheckDescriptorMapping(
|
||||
unittest_pb2.TestNestedExtension.DESCRIPTOR.extensions_by_name)
|
||||
|
||||
def testCppDescriptorContainer_Iterator(self):
|
||||
# Same test with the iterator
|
||||
@@ -521,6 +631,24 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
del enum
|
||||
self.assertEqual('FOO', next(values_iter).name)
|
||||
|
||||
def testServiceDescriptor(self):
|
||||
service_descriptor = unittest_pb2.DESCRIPTOR.services_by_name['TestService']
|
||||
self.assertEqual(service_descriptor.name, 'TestService')
|
||||
self.assertEqual(service_descriptor.methods[0].name, 'Foo')
|
||||
self.assertIs(service_descriptor.file, unittest_pb2.DESCRIPTOR)
|
||||
self.assertEqual(service_descriptor.index, 0)
|
||||
self.CheckDescriptorMapping(service_descriptor.methods_by_name)
|
||||
|
||||
def testOneofDescriptor(self):
|
||||
message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
oneof_descriptor = message_descriptor.oneofs_by_name['oneof_field']
|
||||
self.assertFalse(oneof_descriptor.has_options)
|
||||
self.assertEqual(message_descriptor, oneof_descriptor.containing_type)
|
||||
self.assertEqual('oneof_field', oneof_descriptor.name)
|
||||
self.assertEqual('protobuf_unittest.TestAllTypes.oneof_field',
|
||||
oneof_descriptor.full_name)
|
||||
self.assertEqual(0, oneof_descriptor.index)
|
||||
|
||||
|
||||
class DescriptorCopyToProtoTest(unittest.TestCase):
|
||||
"""Tests for CopyTo functions of Descriptor."""
|
||||
@@ -657,49 +785,64 @@ class DescriptorCopyToProtoTest(unittest.TestCase):
|
||||
descriptor_pb2.DescriptorProto,
|
||||
TEST_MESSAGE_WITH_SEVERAL_EXTENSIONS_ASCII)
|
||||
|
||||
# Disable this test so we can make changes to the proto file.
|
||||
# TODO(xiaofeng): Enable this test after cl/55530659 is submitted.
|
||||
#
|
||||
# def testCopyToProto_FileDescriptor(self):
|
||||
# UNITTEST_IMPORT_FILE_DESCRIPTOR_ASCII = ("""
|
||||
# name: 'google/protobuf/unittest_import.proto'
|
||||
# package: 'protobuf_unittest_import'
|
||||
# dependency: 'google/protobuf/unittest_import_public.proto'
|
||||
# message_type: <
|
||||
# name: 'ImportMessage'
|
||||
# field: <
|
||||
# name: 'd'
|
||||
# number: 1
|
||||
# label: 1 # Optional
|
||||
# type: 5 # TYPE_INT32
|
||||
# >
|
||||
# >
|
||||
# """ +
|
||||
# """enum_type: <
|
||||
# name: 'ImportEnum'
|
||||
# value: <
|
||||
# name: 'IMPORT_FOO'
|
||||
# number: 7
|
||||
# >
|
||||
# value: <
|
||||
# name: 'IMPORT_BAR'
|
||||
# number: 8
|
||||
# >
|
||||
# value: <
|
||||
# name: 'IMPORT_BAZ'
|
||||
# number: 9
|
||||
# >
|
||||
# >
|
||||
# options: <
|
||||
# java_package: 'com.google.protobuf.test'
|
||||
# optimize_for: 1 # SPEED
|
||||
# >
|
||||
# public_dependency: 0
|
||||
# """)
|
||||
# self._InternalTestCopyToProto(
|
||||
# unittest_import_pb2.DESCRIPTOR,
|
||||
# descriptor_pb2.FileDescriptorProto,
|
||||
# UNITTEST_IMPORT_FILE_DESCRIPTOR_ASCII)
|
||||
def testCopyToProto_FileDescriptor(self):
|
||||
UNITTEST_IMPORT_FILE_DESCRIPTOR_ASCII = ("""
|
||||
name: 'google/protobuf/unittest_import.proto'
|
||||
package: 'protobuf_unittest_import'
|
||||
dependency: 'google/protobuf/unittest_import_public.proto'
|
||||
message_type: <
|
||||
name: 'ImportMessage'
|
||||
field: <
|
||||
name: 'd'
|
||||
number: 1
|
||||
label: 1 # Optional
|
||||
type: 5 # TYPE_INT32
|
||||
>
|
||||
>
|
||||
""" +
|
||||
"""enum_type: <
|
||||
name: 'ImportEnum'
|
||||
value: <
|
||||
name: 'IMPORT_FOO'
|
||||
number: 7
|
||||
>
|
||||
value: <
|
||||
name: 'IMPORT_BAR'
|
||||
number: 8
|
||||
>
|
||||
value: <
|
||||
name: 'IMPORT_BAZ'
|
||||
number: 9
|
||||
>
|
||||
>
|
||||
enum_type: <
|
||||
name: 'ImportEnumForMap'
|
||||
value: <
|
||||
name: 'UNKNOWN'
|
||||
number: 0
|
||||
>
|
||||
value: <
|
||||
name: 'FOO'
|
||||
number: 1
|
||||
>
|
||||
value: <
|
||||
name: 'BAR'
|
||||
number: 2
|
||||
>
|
||||
>
|
||||
options: <
|
||||
java_package: 'com.google.protobuf.test'
|
||||
optimize_for: 1 # SPEED
|
||||
""" +
|
||||
"""
|
||||
cc_enable_arenas: true
|
||||
>
|
||||
public_dependency: 0
|
||||
""")
|
||||
self._InternalTestCopyToProto(
|
||||
unittest_import_pb2.DESCRIPTOR,
|
||||
descriptor_pb2.FileDescriptorProto,
|
||||
UNITTEST_IMPORT_FILE_DESCRIPTOR_ASCII)
|
||||
|
||||
def testCopyToProto_ServiceDescriptor(self):
|
||||
TEST_SERVICE_ASCII = """
|
||||
@@ -715,12 +858,47 @@ class DescriptorCopyToProtoTest(unittest.TestCase):
|
||||
output_type: '.protobuf_unittest.BarResponse'
|
||||
>
|
||||
"""
|
||||
# TODO(rocking): enable this test after the proto descriptor change is
|
||||
# checked in.
|
||||
#self._InternalTestCopyToProto(
|
||||
# unittest_pb2.TestService.DESCRIPTOR,
|
||||
# descriptor_pb2.ServiceDescriptorProto,
|
||||
# TEST_SERVICE_ASCII)
|
||||
self._InternalTestCopyToProto(
|
||||
unittest_pb2.TestService.DESCRIPTOR,
|
||||
descriptor_pb2.ServiceDescriptorProto,
|
||||
TEST_SERVICE_ASCII)
|
||||
|
||||
@unittest.skipIf(
|
||||
api_implementation.Type() == 'python',
|
||||
'It is not implemented in python.')
|
||||
# TODO(jieluo): Add support for pure python or remove in c extension.
|
||||
def testCopyToProto_MethodDescriptor(self):
|
||||
expected_ascii = """
|
||||
name: 'Foo'
|
||||
input_type: '.protobuf_unittest.FooRequest'
|
||||
output_type: '.protobuf_unittest.FooResponse'
|
||||
"""
|
||||
method_descriptor = unittest_pb2.TestService.DESCRIPTOR.FindMethodByName(
|
||||
'Foo')
|
||||
self._InternalTestCopyToProto(
|
||||
method_descriptor,
|
||||
descriptor_pb2.MethodDescriptorProto,
|
||||
expected_ascii)
|
||||
|
||||
@unittest.skipIf(
|
||||
api_implementation.Type() == 'python',
|
||||
'Pure python does not raise error.')
|
||||
# TODO(jieluo): Fix pure python to check with the proto type.
|
||||
def testCopyToProto_TypeError(self):
|
||||
file_proto = descriptor_pb2.FileDescriptorProto()
|
||||
self.assertRaises(TypeError,
|
||||
unittest_pb2.TestEmptyMessage.DESCRIPTOR.CopyToProto,
|
||||
file_proto)
|
||||
self.assertRaises(TypeError,
|
||||
unittest_pb2.ForeignEnum.DESCRIPTOR.CopyToProto,
|
||||
file_proto)
|
||||
self.assertRaises(TypeError,
|
||||
unittest_pb2.TestService.DESCRIPTOR.CopyToProto,
|
||||
file_proto)
|
||||
proto = descriptor_pb2.DescriptorProto()
|
||||
self.assertRaises(TypeError,
|
||||
unittest_import_pb2.DESCRIPTOR.CopyToProto,
|
||||
proto)
|
||||
|
||||
|
||||
class MakeDescriptorTest(unittest.TestCase):
|
||||
@@ -768,6 +946,9 @@ class MakeDescriptorTest(unittest.TestCase):
|
||||
result.nested_types[0].enum_types[0])
|
||||
self.assertFalse(result.has_options)
|
||||
self.assertFalse(result.fields[0].has_options)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
with self.assertRaises(AttributeError):
|
||||
result.fields[0].has_options = False
|
||||
|
||||
def testMakeDescriptorWithUnsignedIntField(self):
|
||||
file_descriptor_proto = descriptor_pb2.FileDescriptorProto()
|
||||
|
||||
@@ -372,7 +372,7 @@ def MapSizer(field_descriptor, is_message_map):
|
||||
def _VarintEncoder():
|
||||
"""Return an encoder for a basic varint value (does not include tag)."""
|
||||
|
||||
def EncodeVarint(write, value):
|
||||
def EncodeVarint(write, value, unused_deterministic):
|
||||
bits = value & 0x7f
|
||||
value >>= 7
|
||||
while value:
|
||||
@@ -388,7 +388,7 @@ def _SignedVarintEncoder():
|
||||
"""Return an encoder for a basic signed varint value (does not include
|
||||
tag)."""
|
||||
|
||||
def EncodeSignedVarint(write, value):
|
||||
def EncodeSignedVarint(write, value, unused_deterministic):
|
||||
if value < 0:
|
||||
value += (1 << 64)
|
||||
bits = value & 0x7f
|
||||
@@ -411,14 +411,14 @@ def _VarintBytes(value):
|
||||
called at startup time so it doesn't need to be fast."""
|
||||
|
||||
pieces = []
|
||||
_EncodeVarint(pieces.append, value)
|
||||
_EncodeVarint(pieces.append, value, True)
|
||||
return b"".join(pieces)
|
||||
|
||||
|
||||
def TagBytes(field_number, wire_type):
|
||||
"""Encode the given tag and return the bytes. Only called at startup."""
|
||||
|
||||
return _VarintBytes(wire_format.PackTag(field_number, wire_type))
|
||||
return six.binary_type( _VarintBytes(wire_format.PackTag(field_number, wire_type)) )
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# As with sizers (see above), we have a number of common encoder
|
||||
@@ -440,27 +440,27 @@ def _SimpleEncoder(wire_type, encode_value, compute_value_size):
|
||||
if is_packed:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
def EncodePackedField(write, value):
|
||||
def EncodePackedField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
size = 0
|
||||
for element in value:
|
||||
size += compute_value_size(element)
|
||||
local_EncodeVarint(write, size)
|
||||
local_EncodeVarint(write, size, deterministic)
|
||||
for element in value:
|
||||
encode_value(write, element)
|
||||
encode_value(write, element, deterministic)
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, deterministic):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
encode_value(write, element)
|
||||
encode_value(write, element, deterministic)
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
return encode_value(write, value)
|
||||
return encode_value(write, value, deterministic)
|
||||
return EncodeField
|
||||
|
||||
return SpecificEncoder
|
||||
@@ -474,27 +474,27 @@ def _ModifiedEncoder(wire_type, encode_value, compute_value_size, modify_value):
|
||||
if is_packed:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
def EncodePackedField(write, value):
|
||||
def EncodePackedField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
size = 0
|
||||
for element in value:
|
||||
size += compute_value_size(modify_value(element))
|
||||
local_EncodeVarint(write, size)
|
||||
local_EncodeVarint(write, size, deterministic)
|
||||
for element in value:
|
||||
encode_value(write, modify_value(element))
|
||||
encode_value(write, modify_value(element), deterministic)
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, deterministic):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
encode_value(write, modify_value(element))
|
||||
encode_value(write, modify_value(element), deterministic)
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
return encode_value(write, modify_value(value))
|
||||
return encode_value(write, modify_value(value), deterministic)
|
||||
return EncodeField
|
||||
|
||||
return SpecificEncoder
|
||||
@@ -515,22 +515,22 @@ def _StructPackEncoder(wire_type, format):
|
||||
if is_packed:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
def EncodePackedField(write, value):
|
||||
def EncodePackedField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
local_EncodeVarint(write, len(value) * value_size)
|
||||
local_EncodeVarint(write, len(value) * value_size, deterministic)
|
||||
for element in value:
|
||||
write(local_struct_pack(format, element))
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, unused_deterministic):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
write(local_struct_pack(format, element))
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, unused_deterministic):
|
||||
write(tag_bytes)
|
||||
return write(local_struct_pack(format, value))
|
||||
return EncodeField
|
||||
@@ -581,9 +581,9 @@ def _FloatingPointEncoder(wire_type, format):
|
||||
if is_packed:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
def EncodePackedField(write, value):
|
||||
def EncodePackedField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
local_EncodeVarint(write, len(value) * value_size)
|
||||
local_EncodeVarint(write, len(value) * value_size, deterministic)
|
||||
for element in value:
|
||||
# This try/except block is going to be faster than any code that
|
||||
# we could write to check whether element is finite.
|
||||
@@ -594,7 +594,7 @@ def _FloatingPointEncoder(wire_type, format):
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, unused_deterministic):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
try:
|
||||
@@ -604,7 +604,7 @@ def _FloatingPointEncoder(wire_type, format):
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, unused_deterministic):
|
||||
write(tag_bytes)
|
||||
try:
|
||||
write(local_struct_pack(format, value))
|
||||
@@ -650,9 +650,9 @@ def BoolEncoder(field_number, is_repeated, is_packed):
|
||||
if is_packed:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
def EncodePackedField(write, value):
|
||||
def EncodePackedField(write, value, deterministic):
|
||||
write(tag_bytes)
|
||||
local_EncodeVarint(write, len(value))
|
||||
local_EncodeVarint(write, len(value), deterministic)
|
||||
for element in value:
|
||||
if element:
|
||||
write(true_byte)
|
||||
@@ -661,7 +661,7 @@ def BoolEncoder(field_number, is_repeated, is_packed):
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_VARINT)
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, unused_deterministic):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
if element:
|
||||
@@ -671,7 +671,7 @@ def BoolEncoder(field_number, is_repeated, is_packed):
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_VARINT)
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, unused_deterministic):
|
||||
write(tag_bytes)
|
||||
if value:
|
||||
return write(true_byte)
|
||||
@@ -687,18 +687,18 @@ def StringEncoder(field_number, is_repeated, is_packed):
|
||||
local_len = len
|
||||
assert not is_packed
|
||||
if is_repeated:
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, deterministic):
|
||||
for element in value:
|
||||
encoded = element.encode('utf-8')
|
||||
write(tag)
|
||||
local_EncodeVarint(write, local_len(encoded))
|
||||
local_EncodeVarint(write, local_len(encoded), deterministic)
|
||||
write(encoded)
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
encoded = value.encode('utf-8')
|
||||
write(tag)
|
||||
local_EncodeVarint(write, local_len(encoded))
|
||||
local_EncodeVarint(write, local_len(encoded), deterministic)
|
||||
return write(encoded)
|
||||
return EncodeField
|
||||
|
||||
@@ -711,16 +711,16 @@ def BytesEncoder(field_number, is_repeated, is_packed):
|
||||
local_len = len
|
||||
assert not is_packed
|
||||
if is_repeated:
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, deterministic):
|
||||
for element in value:
|
||||
write(tag)
|
||||
local_EncodeVarint(write, local_len(element))
|
||||
local_EncodeVarint(write, local_len(element), deterministic)
|
||||
write(element)
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
write(tag)
|
||||
local_EncodeVarint(write, local_len(value))
|
||||
local_EncodeVarint(write, local_len(value), deterministic)
|
||||
return write(value)
|
||||
return EncodeField
|
||||
|
||||
@@ -732,16 +732,16 @@ def GroupEncoder(field_number, is_repeated, is_packed):
|
||||
end_tag = TagBytes(field_number, wire_format.WIRETYPE_END_GROUP)
|
||||
assert not is_packed
|
||||
if is_repeated:
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, deterministic):
|
||||
for element in value:
|
||||
write(start_tag)
|
||||
element._InternalSerialize(write)
|
||||
element._InternalSerialize(write, deterministic)
|
||||
write(end_tag)
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
write(start_tag)
|
||||
value._InternalSerialize(write)
|
||||
value._InternalSerialize(write, deterministic)
|
||||
return write(end_tag)
|
||||
return EncodeField
|
||||
|
||||
@@ -753,17 +753,17 @@ def MessageEncoder(field_number, is_repeated, is_packed):
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
assert not is_packed
|
||||
if is_repeated:
|
||||
def EncodeRepeatedField(write, value):
|
||||
def EncodeRepeatedField(write, value, deterministic):
|
||||
for element in value:
|
||||
write(tag)
|
||||
local_EncodeVarint(write, element.ByteSize())
|
||||
element._InternalSerialize(write)
|
||||
local_EncodeVarint(write, element.ByteSize(), deterministic)
|
||||
element._InternalSerialize(write, deterministic)
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
write(tag)
|
||||
local_EncodeVarint(write, value.ByteSize())
|
||||
return value._InternalSerialize(write)
|
||||
local_EncodeVarint(write, value.ByteSize(), deterministic)
|
||||
return value._InternalSerialize(write, deterministic)
|
||||
return EncodeField
|
||||
|
||||
|
||||
@@ -790,10 +790,10 @@ def MessageSetItemEncoder(field_number):
|
||||
end_bytes = TagBytes(1, wire_format.WIRETYPE_END_GROUP)
|
||||
local_EncodeVarint = _EncodeVarint
|
||||
|
||||
def EncodeField(write, value):
|
||||
def EncodeField(write, value, deterministic):
|
||||
write(start_bytes)
|
||||
local_EncodeVarint(write, value.ByteSize())
|
||||
value._InternalSerialize(write)
|
||||
local_EncodeVarint(write, value.ByteSize(), deterministic)
|
||||
value._InternalSerialize(write, deterministic)
|
||||
return write(end_bytes)
|
||||
|
||||
return EncodeField
|
||||
@@ -818,9 +818,10 @@ def MapEncoder(field_descriptor):
|
||||
message_type = field_descriptor.message_type
|
||||
encode_message = MessageEncoder(field_descriptor.number, False, False)
|
||||
|
||||
def EncodeField(write, value):
|
||||
for key in value:
|
||||
def EncodeField(write, value, deterministic):
|
||||
value_keys = sorted(value.keys()) if deterministic else value
|
||||
for key in value_keys:
|
||||
entry_msg = message_type._concrete_class(key=key, value=value[key])
|
||||
encode_message(write, entry_msg)
|
||||
encode_message(write, entry_msg, deterministic)
|
||||
|
||||
return EncodeField
|
||||
@@ -86,7 +86,7 @@ _FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -116,35 +116,35 @@ _FACTORY1MESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_factory_1_enum', full_name='google.protobuf.python.internal.Factory1Message.nested_factory_1_enum', index=1,
|
||||
number=2, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_factory_1_message', full_name='google.protobuf.python.internal.Factory1Message.nested_factory_1_message', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='scalar_value', full_name='google.protobuf.python.internal.Factory1Message.scalar_value', index=3,
|
||||
number=4, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='list_value', full_name='google.protobuf.python.internal.Factory1Message.list_value', index=4,
|
||||
number=5, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -97,3 +97,8 @@ message MessageWithNestedEnumOnly {
|
||||
extend Factory1Message {
|
||||
optional string another_field = 1002;
|
||||
}
|
||||
|
||||
message MessageWithOption {
|
||||
option no_standard_descriptor_accessor = true;
|
||||
optional int32 field1 = 1;
|
||||
}
|
||||
@@ -21,7 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/factory_test2.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_pb=_b('\n,google/protobuf/internal/factory_test2.proto\x12\x1fgoogle.protobuf.python.internal\x1a,google/protobuf/internal/factory_test1.proto\"\xd8\x0b\n\x0f\x46\x61\x63tory2Message\x12\x11\n\tmandatory\x18\x01 \x02(\x05\x12\x45\n\x0e\x66\x61\x63tory_2_enum\x18\x02 \x01(\x0e\x32-.google.protobuf.python.internal.Factory2Enum\x12\x62\n\x15nested_factory_2_enum\x18\x03 \x01(\x0e\x32\x43.google.protobuf.python.internal.Factory2Message.NestedFactory2Enum\x12h\n\x18nested_factory_2_message\x18\x04 \x01(\x0b\x32\x46.google.protobuf.python.internal.Factory2Message.NestedFactory2Message\x12K\n\x11\x66\x61\x63tory_1_message\x18\x05 \x01(\x0b\x32\x30.google.protobuf.python.internal.Factory1Message\x12\x45\n\x0e\x66\x61\x63tory_1_enum\x18\x06 \x01(\x0e\x32-.google.protobuf.python.internal.Factory1Enum\x12\x62\n\x15nested_factory_1_enum\x18\x07 \x01(\x0e\x32\x43.google.protobuf.python.internal.Factory1Message.NestedFactory1Enum\x12h\n\x18nested_factory_1_message\x18\x08 \x01(\x0b\x32\x46.google.protobuf.python.internal.Factory1Message.NestedFactory1Message\x12J\n\x10\x63ircular_message\x18\t \x01(\x0b\x32\x30.google.protobuf.python.internal.Factory2Message\x12\x14\n\x0cscalar_value\x18\n \x01(\t\x12\x12\n\nlist_value\x18\x0b \x03(\t\x12I\n\x07grouped\x18\x0c \x03(\n28.google.protobuf.python.internal.Factory2Message.Grouped\x12:\n\x04loop\x18\x0f \x01(\x0b\x32,.google.protobuf.python.internal.LoopMessage\x12\x1e\n\x10int_with_default\x18\x10 \x01(\x05:\x04\x31\x37\x37\x36\x12!\n\x13\x64ouble_with_default\x18\x11 \x01(\x01:\x04\x39.99\x12(\n\x13string_with_default\x18\x12 \x01(\t:\x0bhello world\x12 \n\x11\x62ool_with_default\x18\x13 \x01(\x08:\x05\x66\x61lse\x12[\n\x11\x65num_with_default\x18\x14 \x01(\x0e\x32-.google.protobuf.python.internal.Factory2Enum:\x11\x46\x41\x43TORY_2_VALUE_1\x12&\n\x12\x62ytes_with_default\x18\x15 \x01(\x0c:\na\\373\\000c\x12\x13\n\toneof_int\x18\x16 \x01(\x05H\x00\x12\x16\n\x0coneof_string\x18\x17 \x01(\tH\x00\x1a&\n\x15NestedFactory2Message\x12\r\n\x05value\x18\x01 \x01(\t\x1a)\n\x07Grouped\x12\x0e\n\x06part_1\x18\r \x01(\t\x12\x0e\n\x06part_2\x18\x0e \x01(\t\"P\n\x12NestedFactory2Enum\x12\x1c\n\x18NESTED_FACTORY_2_VALUE_0\x10\x00\x12\x1c\n\x18NESTED_FACTORY_2_VALUE_1\x10\x01\x32I\n\x0eone_more_field\x12\x30.google.protobuf.python.internal.Factory1Message\x18\xe9\x07 \x01(\tB\r\n\x0boneof_field\"M\n\x0bLoopMessage\x12>\n\x04loop\x18\x01 \x01(\x0b\x32\x30.google.protobuf.python.internal.Factory2Message\"D\n\x19MessageWithNestedEnumOnly\"\'\n\nNestedEnum\x12\x19\n\x15NESTED_MESSAGE_ENUM_0\x10\x00*<\n\x0c\x46\x61\x63tory2Enum\x12\x15\n\x11\x46\x41\x43TORY_2_VALUE_0\x10\x00\x12\x15\n\x11\x46\x41\x43TORY_2_VALUE_1\x10\x01:H\n\ranother_field\x12\x30.google.protobuf.python.internal.Factory1Message\x18\xea\x07 \x01(\t')
|
||||
serialized_pb=_b('\n,google/protobuf/internal/factory_test2.proto\x12\x1fgoogle.protobuf.python.internal\x1a,google/protobuf/internal/factory_test1.proto\"\xd8\x0b\n\x0f\x46\x61\x63tory2Message\x12\x11\n\tmandatory\x18\x01 \x02(\x05\x12\x45\n\x0e\x66\x61\x63tory_2_enum\x18\x02 \x01(\x0e\x32-.google.protobuf.python.internal.Factory2Enum\x12\x62\n\x15nested_factory_2_enum\x18\x03 \x01(\x0e\x32\x43.google.protobuf.python.internal.Factory2Message.NestedFactory2Enum\x12h\n\x18nested_factory_2_message\x18\x04 \x01(\x0b\x32\x46.google.protobuf.python.internal.Factory2Message.NestedFactory2Message\x12K\n\x11\x66\x61\x63tory_1_message\x18\x05 \x01(\x0b\x32\x30.google.protobuf.python.internal.Factory1Message\x12\x45\n\x0e\x66\x61\x63tory_1_enum\x18\x06 \x01(\x0e\x32-.google.protobuf.python.internal.Factory1Enum\x12\x62\n\x15nested_factory_1_enum\x18\x07 \x01(\x0e\x32\x43.google.protobuf.python.internal.Factory1Message.NestedFactory1Enum\x12h\n\x18nested_factory_1_message\x18\x08 \x01(\x0b\x32\x46.google.protobuf.python.internal.Factory1Message.NestedFactory1Message\x12J\n\x10\x63ircular_message\x18\t \x01(\x0b\x32\x30.google.protobuf.python.internal.Factory2Message\x12\x14\n\x0cscalar_value\x18\n \x01(\t\x12\x12\n\nlist_value\x18\x0b \x03(\t\x12I\n\x07grouped\x18\x0c \x03(\n28.google.protobuf.python.internal.Factory2Message.Grouped\x12:\n\x04loop\x18\x0f \x01(\x0b\x32,.google.protobuf.python.internal.LoopMessage\x12\x1e\n\x10int_with_default\x18\x10 \x01(\x05:\x04\x31\x37\x37\x36\x12!\n\x13\x64ouble_with_default\x18\x11 \x01(\x01:\x04\x39.99\x12(\n\x13string_with_default\x18\x12 \x01(\t:\x0bhello world\x12 \n\x11\x62ool_with_default\x18\x13 \x01(\x08:\x05\x66\x61lse\x12[\n\x11\x65num_with_default\x18\x14 \x01(\x0e\x32-.google.protobuf.python.internal.Factory2Enum:\x11\x46\x41\x43TORY_2_VALUE_1\x12&\n\x12\x62ytes_with_default\x18\x15 \x01(\x0c:\na\\373\\000c\x12\x13\n\toneof_int\x18\x16 \x01(\x05H\x00\x12\x16\n\x0coneof_string\x18\x17 \x01(\tH\x00\x1a&\n\x15NestedFactory2Message\x12\r\n\x05value\x18\x01 \x01(\t\x1a)\n\x07Grouped\x12\x0e\n\x06part_1\x18\r \x01(\t\x12\x0e\n\x06part_2\x18\x0e \x01(\t\"P\n\x12NestedFactory2Enum\x12\x1c\n\x18NESTED_FACTORY_2_VALUE_0\x10\x00\x12\x1c\n\x18NESTED_FACTORY_2_VALUE_1\x10\x01\x32I\n\x0eone_more_field\x12\x30.google.protobuf.python.internal.Factory1Message\x18\xe9\x07 \x01(\tB\r\n\x0boneof_field\"M\n\x0bLoopMessage\x12>\n\x04loop\x18\x01 \x01(\x0b\x32\x30.google.protobuf.python.internal.Factory2Message\"D\n\x19MessageWithNestedEnumOnly\"\'\n\nNestedEnum\x12\x19\n\x15NESTED_MESSAGE_ENUM_0\x10\x00\"\'\n\x11MessageWithOption\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\x05:\x02\x10\x01*<\n\x0c\x46\x61\x63tory2Enum\x12\x15\n\x11\x46\x41\x43TORY_2_VALUE_0\x10\x00\x12\x15\n\x11\x46\x41\x43TORY_2_VALUE_1\x10\x01:H\n\ranother_field\x12\x30.google.protobuf.python.internal.Factory1Message\x18\xea\x07 \x01(\t')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_internal_dot_factory__test1__pb2.DESCRIPTOR,])
|
||||
|
||||
@@ -42,8 +42,8 @@ _FACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_start=1775,
|
||||
serialized_end=1835,
|
||||
serialized_start=1816,
|
||||
serialized_end=1876,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_FACTORY2ENUM)
|
||||
|
||||
@@ -58,7 +58,7 @@ another_field = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedFactory2Enum',
|
||||
@@ -114,7 +114,7 @@ _FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -144,14 +144,14 @@ _FACTORY2MESSAGE_GROUPED = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='part_2', full_name='google.protobuf.python.internal.Factory2Message.Grouped.part_2', index=1,
|
||||
number=14, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -181,147 +181,147 @@ _FACTORY2MESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='factory_2_enum', full_name='google.protobuf.python.internal.Factory2Message.factory_2_enum', index=1,
|
||||
number=2, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_factory_2_enum', full_name='google.protobuf.python.internal.Factory2Message.nested_factory_2_enum', index=2,
|
||||
number=3, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_factory_2_message', full_name='google.protobuf.python.internal.Factory2Message.nested_factory_2_message', index=3,
|
||||
number=4, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='factory_1_message', full_name='google.protobuf.python.internal.Factory2Message.factory_1_message', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='factory_1_enum', full_name='google.protobuf.python.internal.Factory2Message.factory_1_enum', index=5,
|
||||
number=6, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_factory_1_enum', full_name='google.protobuf.python.internal.Factory2Message.nested_factory_1_enum', index=6,
|
||||
number=7, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_factory_1_message', full_name='google.protobuf.python.internal.Factory2Message.nested_factory_1_message', index=7,
|
||||
number=8, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='circular_message', full_name='google.protobuf.python.internal.Factory2Message.circular_message', index=8,
|
||||
number=9, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='scalar_value', full_name='google.protobuf.python.internal.Factory2Message.scalar_value', index=9,
|
||||
number=10, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='list_value', full_name='google.protobuf.python.internal.Factory2Message.list_value', index=10,
|
||||
number=11, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='grouped', full_name='google.protobuf.python.internal.Factory2Message.grouped', index=11,
|
||||
number=12, type=10, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='loop', full_name='google.protobuf.python.internal.Factory2Message.loop', index=12,
|
||||
number=15, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int_with_default', full_name='google.protobuf.python.internal.Factory2Message.int_with_default', index=13,
|
||||
number=16, type=5, cpp_type=1, label=1,
|
||||
has_default_value=True, default_value=1776,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='double_with_default', full_name='google.protobuf.python.internal.Factory2Message.double_with_default', index=14,
|
||||
number=17, type=1, cpp_type=5, label=1,
|
||||
has_default_value=True, default_value=float(9.99),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='string_with_default', full_name='google.protobuf.python.internal.Factory2Message.string_with_default', index=15,
|
||||
number=18, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("hello world").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bool_with_default', full_name='google.protobuf.python.internal.Factory2Message.bool_with_default', index=16,
|
||||
number=19, type=8, cpp_type=7, label=1,
|
||||
has_default_value=True, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='enum_with_default', full_name='google.protobuf.python.internal.Factory2Message.enum_with_default', index=17,
|
||||
number=20, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=1,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bytes_with_default', full_name='google.protobuf.python.internal.Factory2Message.bytes_with_default', index=18,
|
||||
number=21, type=12, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("a\373\000c"),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_int', full_name='google.protobuf.python.internal.Factory2Message.oneof_int', index=19,
|
||||
number=22, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_string', full_name='google.protobuf.python.internal.Factory2Message.oneof_string', index=20,
|
||||
number=23, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -330,7 +330,7 @@ _FACTORY2MESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE, _FACTORY2MESSAGE_GROUPED, ],
|
||||
enum_types=[
|
||||
@@ -363,7 +363,7 @@ _LOOPMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -405,6 +405,37 @@ _MESSAGEWITHNESTEDENUMONLY = _descriptor.Descriptor(
|
||||
serialized_end=1773,
|
||||
)
|
||||
|
||||
|
||||
_MESSAGEWITHOPTION = _descriptor.Descriptor(
|
||||
name='MessageWithOption',
|
||||
full_name='google.protobuf.python.internal.MessageWithOption',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='field1', full_name='google.protobuf.python.internal.MessageWithOption.field1', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\020\001')),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1775,
|
||||
serialized_end=1814,
|
||||
)
|
||||
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE.containing_type = _FACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE_GROUPED.containing_type = _FACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['factory_2_enum'].enum_type = _FACTORY2ENUM
|
||||
@@ -430,6 +461,7 @@ _MESSAGEWITHNESTEDENUMONLY_NESTEDENUM.containing_type = _MESSAGEWITHNESTEDENUMON
|
||||
DESCRIPTOR.message_types_by_name['Factory2Message'] = _FACTORY2MESSAGE
|
||||
DESCRIPTOR.message_types_by_name['LoopMessage'] = _LOOPMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['MessageWithNestedEnumOnly'] = _MESSAGEWITHNESTEDENUMONLY
|
||||
DESCRIPTOR.message_types_by_name['MessageWithOption'] = _MESSAGEWITHOPTION
|
||||
DESCRIPTOR.enum_types_by_name['Factory2Enum'] = _FACTORY2ENUM
|
||||
DESCRIPTOR.extensions_by_name['another_field'] = another_field
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
@@ -471,7 +503,16 @@ MessageWithNestedEnumOnly = _reflection.GeneratedProtocolMessageType('MessageWit
|
||||
))
|
||||
_sym_db.RegisterMessage(MessageWithNestedEnumOnly)
|
||||
|
||||
MessageWithOption = _reflection.GeneratedProtocolMessageType('MessageWithOption', (_message.Message,), dict(
|
||||
DESCRIPTOR = _MESSAGEWITHOPTION,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.MessageWithOption)
|
||||
))
|
||||
_sym_db.RegisterMessage(MessageWithOption)
|
||||
|
||||
google_dot_protobuf_dot_internal_dot_factory__test1__pb2.Factory1Message.RegisterExtension(another_field)
|
||||
google_dot_protobuf_dot_internal_dot_factory__test1__pb2.Factory1Message.RegisterExtension(_FACTORY2MESSAGE.extensions_by_name['one_more_field'])
|
||||
|
||||
_MESSAGEWITHOPTION.has_options = True
|
||||
_MESSAGEWITHOPTION._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\020\001'))
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -32,7 +32,7 @@ foo_options = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_FOOOPTIONS = _descriptor.Descriptor(
|
||||
@@ -48,7 +48,7 @@ _FOOOPTIONS = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -38,7 +38,7 @@ _INNER = _descriptor.Descriptor(
|
||||
has_default_value=True, default_value=57,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -40,7 +40,7 @@ _OUTER = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -49,6 +49,8 @@ from google.protobuf import field_mask_pb2
|
||||
from google.protobuf import struct_pb2
|
||||
from google.protobuf import timestamp_pb2
|
||||
from google.protobuf import wrappers_pb2
|
||||
from google.protobuf import unittest_mset_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf.internal import well_known_types
|
||||
from google.protobuf import json_format
|
||||
from google.protobuf.util import json_format_proto3_pb2
|
||||
@@ -158,6 +160,98 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.Parse(text, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
|
||||
def testUnknownEnumToJsonAndBack(self):
|
||||
text = '{\n "enumValue": 999\n}'
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
message.enum_value = 999
|
||||
self.assertEqual(json_format.MessageToJson(message),
|
||||
text)
|
||||
parsed_message = json_format_proto3_pb2.TestMessage()
|
||||
json_format.Parse(text, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
|
||||
def testExtensionToJsonAndBack(self):
|
||||
message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
|
||||
ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
|
||||
message.message_set.Extensions[ext1].i = 23
|
||||
message.message_set.Extensions[ext2].str = 'foo'
|
||||
message_text = json_format.MessageToJson(
|
||||
message
|
||||
)
|
||||
parsed_message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
json_format.Parse(message_text, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
|
||||
def testExtensionErrors(self):
|
||||
self.CheckError('{"[extensionField]": {}}',
|
||||
'Message type proto3.TestMessage does not have extensions')
|
||||
|
||||
def testExtensionToDictAndBack(self):
|
||||
message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
|
||||
ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
|
||||
message.message_set.Extensions[ext1].i = 23
|
||||
message.message_set.Extensions[ext2].str = 'foo'
|
||||
message_dict = json_format.MessageToDict(
|
||||
message
|
||||
)
|
||||
parsed_message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
json_format.ParseDict(message_dict, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
|
||||
def testExtensionSerializationDictMatchesProto3Spec(self):
|
||||
"""See go/proto3-json-spec for spec.
|
||||
"""
|
||||
message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
|
||||
ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
|
||||
message.message_set.Extensions[ext1].i = 23
|
||||
message.message_set.Extensions[ext2].str = 'foo'
|
||||
message_dict = json_format.MessageToDict(
|
||||
message
|
||||
)
|
||||
golden_dict = {
|
||||
'messageSet': {
|
||||
'[protobuf_unittest.'
|
||||
'TestMessageSetExtension1.messageSetExtension]': {
|
||||
'i': 23,
|
||||
},
|
||||
'[protobuf_unittest.'
|
||||
'TestMessageSetExtension2.messageSetExtension]': {
|
||||
'str': u'foo',
|
||||
},
|
||||
},
|
||||
}
|
||||
self.assertEqual(golden_dict, message_dict)
|
||||
|
||||
|
||||
def testExtensionSerializationJsonMatchesProto3Spec(self):
|
||||
"""See go/proto3-json-spec for spec.
|
||||
"""
|
||||
message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
|
||||
ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
|
||||
message.message_set.Extensions[ext1].i = 23
|
||||
message.message_set.Extensions[ext2].str = 'foo'
|
||||
message_text = json_format.MessageToJson(
|
||||
message
|
||||
)
|
||||
ext1_text = ('protobuf_unittest.TestMessageSetExtension1.'
|
||||
'messageSetExtension')
|
||||
ext2_text = ('protobuf_unittest.TestMessageSetExtension2.'
|
||||
'messageSetExtension')
|
||||
golden_text = ('{"messageSet": {'
|
||||
' "[%s]": {'
|
||||
' "i": 23'
|
||||
' },'
|
||||
' "[%s]": {'
|
||||
' "str": "foo"'
|
||||
' }'
|
||||
'}}') % (ext1_text, ext2_text)
|
||||
self.assertEqual(json.loads(golden_text), json.loads(message_text))
|
||||
|
||||
|
||||
def testJsonEscapeString(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
if sys.version_info[0] < 3:
|
||||
@@ -215,7 +309,18 @@ class JsonFormatTest(JsonFormatBase):
|
||||
self.assertEqual(message.int32_value, 1)
|
||||
|
||||
def testMapFields(self):
|
||||
message = json_format_proto3_pb2.TestMap()
|
||||
message = json_format_proto3_pb2.TestNestedMap()
|
||||
self.assertEqual(
|
||||
json.loads(json_format.MessageToJson(message, True)),
|
||||
json.loads('{'
|
||||
'"boolMap": {},'
|
||||
'"int32Map": {},'
|
||||
'"int64Map": {},'
|
||||
'"uint32Map": {},'
|
||||
'"uint64Map": {},'
|
||||
'"stringMap": {},'
|
||||
'"mapMap": {}'
|
||||
'}'))
|
||||
message.bool_map[True] = 1
|
||||
message.bool_map[False] = 2
|
||||
message.int32_map[1] = 2
|
||||
@@ -228,17 +333,19 @@ class JsonFormatTest(JsonFormatBase):
|
||||
message.uint64_map[2] = 3
|
||||
message.string_map['1'] = 2
|
||||
message.string_map['null'] = 3
|
||||
message.map_map['1'].bool_map[True] = 3
|
||||
self.assertEqual(
|
||||
json.loads(json_format.MessageToJson(message, True)),
|
||||
json.loads(json_format.MessageToJson(message, False)),
|
||||
json.loads('{'
|
||||
'"boolMap": {"false": 2, "true": 1},'
|
||||
'"int32Map": {"1": 2, "2": 3},'
|
||||
'"int64Map": {"1": 2, "2": 3},'
|
||||
'"uint32Map": {"1": 2, "2": 3},'
|
||||
'"uint64Map": {"1": 2, "2": 3},'
|
||||
'"stringMap": {"1": 2, "null": 3}'
|
||||
'"stringMap": {"1": 2, "null": 3},'
|
||||
'"mapMap": {"1": {"boolMap": {"true": 3}}}'
|
||||
'}'))
|
||||
parsed_message = json_format_proto3_pb2.TestMap()
|
||||
parsed_message = json_format_proto3_pb2.TestNestedMap()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
|
||||
def testOneofFields(self):
|
||||
@@ -624,6 +731,9 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.Parse,
|
||||
'{"repeatedInt32Value":[1, null]}',
|
||||
parsed_message)
|
||||
self.CheckError('{"repeatedMessageValue":[null]}',
|
||||
'Failed to parse repeatedMessageValue field: null is not'
|
||||
' allowed to be used as an element in a repeated field.')
|
||||
|
||||
def testNanFloat(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
@@ -648,6 +758,16 @@ class JsonFormatTest(JsonFormatBase):
|
||||
'{"enumValue": "baz"}',
|
||||
'Failed to parse enumValue field: Invalid enum value baz '
|
||||
'for enum type proto3.EnumType.')
|
||||
# Proto3 accepts numeric unknown enums.
|
||||
text = '{"enumValue": 12345}'
|
||||
json_format.Parse(text, message)
|
||||
# Proto2 does not accept unknown enums.
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
'Failed to parse optionalNestedEnum field: Invalid enum value 12345 '
|
||||
'for enum type protobuf_unittest.TestAllTypes.NestedEnum.',
|
||||
json_format.Parse, '{"optionalNestedEnum": 12345}', message)
|
||||
|
||||
def testParseBadIdentifer(self):
|
||||
self.CheckError('{int32Value: 1}',
|
||||
@@ -720,6 +840,11 @@ class JsonFormatTest(JsonFormatBase):
|
||||
self.CheckError('{"bytesValue": "AQI*"}',
|
||||
'Failed to parse bytesValue field: Incorrect padding.')
|
||||
|
||||
def testInvalidRepeated(self):
|
||||
self.CheckError('{"repeatedInt32Value": 12345}',
|
||||
(r'Failed to parse repeatedInt32Value field: repeated field'
|
||||
r' repeatedInt32Value must be in \[\] which is 12345.'))
|
||||
|
||||
def testInvalidMap(self):
|
||||
message = json_format_proto3_pb2.TestMap()
|
||||
text = '{"int32Map": {"null": 2, "2": 3}}'
|
||||
@@ -745,6 +870,12 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.ParseError,
|
||||
'Failed to load JSON: duplicate key a',
|
||||
json_format.Parse, text, message)
|
||||
text = r'{"stringMap": 0}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
'Failed to parse stringMap field: Map field string_map must be '
|
||||
'in a dict which is 0.',
|
||||
json_format.Parse, text, message)
|
||||
|
||||
def testInvalidTimestamp(self):
|
||||
message = json_format_proto3_pb2.TestTimestamp()
|
||||
@@ -768,7 +899,7 @@ class JsonFormatTest(JsonFormatBase):
|
||||
text = '{"value": "0000-01-01T00:00:00Z"}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
'Failed to parse value field: year is out of range.',
|
||||
'Failed to parse value field: year (0 )?is out of range.',
|
||||
json_format.Parse, text, message)
|
||||
# Time bigger than maxinum time.
|
||||
message.value.seconds = 253402300800
|
||||
@@ -832,6 +963,12 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.MessageToJson(message))
|
||||
self.assertEqual('{\n "int32_value": 12345\n}',
|
||||
json_format.MessageToJson(message, False, True))
|
||||
# When including_default_value_fields is True.
|
||||
message = json_format_proto3_pb2.TestTimestamp()
|
||||
self.assertEqual('{\n "repeatedValue": []\n}',
|
||||
json_format.MessageToJson(message, True, False))
|
||||
self.assertEqual('{\n "repeated_value": []\n}',
|
||||
json_format.MessageToJson(message, True, True))
|
||||
|
||||
# Parsers accept both original proto field names and lowerCamelCase names.
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
@@ -840,6 +977,12 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.Parse('{"int32_value": 12345}', message)
|
||||
self.assertEqual(12345, message.int32_value)
|
||||
|
||||
def testIndent(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
message.int32_value = 12345
|
||||
self.assertEqual('{\n"int32Value": 12345\n}',
|
||||
json_format.MessageToJson(message, indent=0))
|
||||
|
||||
def testParseDict(self):
|
||||
expected = 12345
|
||||
js_dict = {'int32Value': expected}
|
||||
@@ -862,6 +1005,22 @@ class JsonFormatTest(JsonFormatBase):
|
||||
parsed_message = json_format_proto3_pb2.TestCustomJsonName()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
|
||||
def testSortKeys(self):
|
||||
# Testing sort_keys is not perfectly working, as by random luck we could
|
||||
# get the output sorted. We just use a selection of names.
|
||||
message = json_format_proto3_pb2.TestMessage(bool_value=True,
|
||||
int32_value=1,
|
||||
int64_value=3,
|
||||
uint32_value=4,
|
||||
string_value='bla')
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message, sort_keys=True),
|
||||
# We use json.dumps() instead of a hardcoded string due to differences
|
||||
# between Python 2 and Python 3.
|
||||
json.dumps({'boolValue': True, 'int32Value': 1, 'int64Value': '3',
|
||||
'uint32Value': 4, 'stringValue': 'bla'},
|
||||
indent=2, sort_keys=True))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -40,6 +40,7 @@ except ImportError:
|
||||
import unittest
|
||||
|
||||
from google.protobuf import descriptor_pb2
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import factory_test1_pb2
|
||||
from google.protobuf.internal import factory_test2_pb2
|
||||
from google.protobuf import descriptor_database
|
||||
@@ -106,8 +107,17 @@ class MessageFactoryTest(unittest.TestCase):
|
||||
def testGetMessages(self):
|
||||
# performed twice because multiple calls with the same input must be allowed
|
||||
for _ in range(2):
|
||||
messages = message_factory.GetMessages([self.factory_test1_fd,
|
||||
self.factory_test2_fd])
|
||||
# GetMessage should work regardless of the order the FileDescriptorProto
|
||||
# are provided. In particular, the function should succeed when the files
|
||||
# are not in the topological order of dependencies.
|
||||
|
||||
# Assuming factory_test2_fd depends on factory_test1_fd.
|
||||
self.assertIn(self.factory_test1_fd.name,
|
||||
self.factory_test2_fd.dependency)
|
||||
# Get messages should work when a file comes before its dependencies:
|
||||
# factory_test2_fd comes before factory_test1_fd.
|
||||
messages = message_factory.GetMessages([self.factory_test2_fd,
|
||||
self.factory_test1_fd])
|
||||
self.assertTrue(
|
||||
set(['google.protobuf.python.internal.Factory2Message',
|
||||
'google.protobuf.python.internal.Factory1Message'],
|
||||
@@ -130,6 +140,21 @@ class MessageFactoryTest(unittest.TestCase):
|
||||
msg1.Extensions[ext2] = 'test2'
|
||||
self.assertEqual('test1', msg1.Extensions[ext1])
|
||||
self.assertEqual('test2', msg1.Extensions[ext2])
|
||||
self.assertEqual(None,
|
||||
msg1.Extensions._FindExtensionByNumber(12321))
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix len to return the correct value.
|
||||
# self.assertEqual(2, len(msg1.Extensions))
|
||||
self.assertEqual(len(msg1.Extensions), len(msg1.Extensions))
|
||||
self.assertRaises(TypeError,
|
||||
msg1.Extensions._FindExtensionByName, 0)
|
||||
self.assertRaises(TypeError,
|
||||
msg1.Extensions._FindExtensionByNumber, '')
|
||||
else:
|
||||
self.assertEqual(None,
|
||||
msg1.Extensions._FindExtensionByName(0))
|
||||
self.assertEqual(None,
|
||||
msg1.Extensions._FindExtensionByNumber(''))
|
||||
|
||||
def testDuplicateExtensionNumber(self):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
@@ -183,7 +208,14 @@ class MessageFactoryTest(unittest.TestCase):
|
||||
with self.assertRaises(Exception) as cm:
|
||||
factory.GetMessages([f.name])
|
||||
|
||||
self.assertIsInstance(cm.exception, (AssertionError, ValueError))
|
||||
self.assertIn(str(cm.exception),
|
||||
['Extensions '
|
||||
'"google.protobuf.python.internal.Duplicate.extension_field" and'
|
||||
' "google.protobuf.python.internal.Extension.extension_field"'
|
||||
' both try to extend message type'
|
||||
' "google.protobuf.python.internal.Container"'
|
||||
' with field number 2.',
|
||||
'Double registration of Extensions'])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
@@ -30,7 +30,7 @@ message_set_extension3 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTMESSAGESET = _descriptor.Descriptor(
|
||||
@@ -70,7 +70,7 @@ _TESTMESSAGESETEXTENSION1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -79,7 +79,7 @@ _TESTMESSAGESETEXTENSION1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -108,7 +108,7 @@ _TESTMESSAGESETEXTENSION2 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -117,7 +117,7 @@ _TESTMESSAGESETEXTENSION2 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -146,7 +146,7 @@ _TESTMESSAGESETEXTENSION3 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -51,12 +51,18 @@ import operator
|
||||
import pickle
|
||||
import six
|
||||
import sys
|
||||
import warnings
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
import unittest2 as unittest # PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
try:
|
||||
cmp # Python 2
|
||||
except NameError:
|
||||
cmp = lambda x, y: (x > y) - (x < y) # Python 3
|
||||
|
||||
from google.protobuf import map_proto2_unittest_pb2
|
||||
from google.protobuf import map_unittest_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import unittest_proto3_arena_pb2
|
||||
@@ -65,6 +71,7 @@ from google.protobuf import descriptor_pool
|
||||
from google.protobuf import message_factory
|
||||
from google.protobuf import text_format
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import encoder
|
||||
from google.protobuf.internal import packed_field_test_pb2
|
||||
from google.protobuf.internal import test_util
|
||||
from google.protobuf.internal import testing_refleaks
|
||||
@@ -136,6 +143,63 @@ class MessageTest(BaseTestCase):
|
||||
golden_copy = copy.deepcopy(golden_message)
|
||||
self.assertEqual(golden_data, golden_copy.SerializeToString())
|
||||
|
||||
def testParseErrors(self, message_module):
|
||||
msg = message_module.TestAllTypes()
|
||||
self.assertRaises(TypeError, msg.FromString, 0)
|
||||
self.assertRaises(Exception, msg.FromString, '0')
|
||||
# TODO(jieluo): Fix cpp extension to raise error instead of warning.
|
||||
# b/27494216
|
||||
end_tag = encoder.TagBytes(1, 4)
|
||||
if api_implementation.Type() == 'python':
|
||||
with self.assertRaises(message.DecodeError) as context:
|
||||
msg.FromString(end_tag)
|
||||
self.assertEqual('Unexpected end-group tag.', str(context.exception))
|
||||
else:
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
# Cause all warnings to always be triggered.
|
||||
warnings.simplefilter('always')
|
||||
msg.FromString(end_tag)
|
||||
assert len(w) == 1
|
||||
assert issubclass(w[-1].category, RuntimeWarning)
|
||||
self.assertEqual('Unexpected end-group tag: Not all data was converted',
|
||||
str(w[-1].message))
|
||||
|
||||
def testDeterminismParameters(self, message_module):
|
||||
# This message is always deterministically serialized, even if determinism
|
||||
# is disabled, so we can use it to verify that all the determinism
|
||||
# parameters work correctly.
|
||||
golden_data = (b'\xe2\x02\nOne string'
|
||||
b'\xe2\x02\nTwo string'
|
||||
b'\xe2\x02\nRed string'
|
||||
b'\xe2\x02\x0bBlue string')
|
||||
golden_message = message_module.TestAllTypes()
|
||||
golden_message.repeated_string.extend([
|
||||
'One string',
|
||||
'Two string',
|
||||
'Red string',
|
||||
'Blue string',
|
||||
])
|
||||
self.assertEqual(golden_data,
|
||||
golden_message.SerializeToString(deterministic=None))
|
||||
self.assertEqual(golden_data,
|
||||
golden_message.SerializeToString(deterministic=False))
|
||||
self.assertEqual(golden_data,
|
||||
golden_message.SerializeToString(deterministic=True))
|
||||
|
||||
class BadArgError(Exception):
|
||||
pass
|
||||
|
||||
class BadArg(object):
|
||||
|
||||
def __nonzero__(self):
|
||||
raise BadArgError()
|
||||
|
||||
def __bool__(self):
|
||||
raise BadArgError()
|
||||
|
||||
with self.assertRaises(BadArgError):
|
||||
golden_message.SerializeToString(deterministic=BadArg())
|
||||
|
||||
def testPickleSupport(self, message_module):
|
||||
golden_data = test_util.GoldenFileData('golden_message')
|
||||
golden_message = message_module.TestAllTypes()
|
||||
@@ -377,6 +441,7 @@ class MessageTest(BaseTestCase):
|
||||
self.assertEqual(message.repeated_int32[0], 1)
|
||||
self.assertEqual(message.repeated_int32[1], 2)
|
||||
self.assertEqual(message.repeated_int32[2], 3)
|
||||
self.assertEqual(str(message.repeated_int32), str([1, 2, 3]))
|
||||
|
||||
message.repeated_float.append(1.1)
|
||||
message.repeated_float.append(1.3)
|
||||
@@ -393,6 +458,7 @@ class MessageTest(BaseTestCase):
|
||||
self.assertEqual(message.repeated_string[0], 'a')
|
||||
self.assertEqual(message.repeated_string[1], 'b')
|
||||
self.assertEqual(message.repeated_string[2], 'c')
|
||||
self.assertEqual(str(message.repeated_string), str([u'a', u'b', u'c']))
|
||||
|
||||
message.repeated_bytes.append(b'a')
|
||||
message.repeated_bytes.append(b'c')
|
||||
@@ -401,6 +467,7 @@ class MessageTest(BaseTestCase):
|
||||
self.assertEqual(message.repeated_bytes[0], b'a')
|
||||
self.assertEqual(message.repeated_bytes[1], b'b')
|
||||
self.assertEqual(message.repeated_bytes[2], b'c')
|
||||
self.assertEqual(str(message.repeated_bytes), str([b'a', b'b', b'c']))
|
||||
|
||||
def testSortingRepeatedScalarFieldsCustomComparator(self, message_module):
|
||||
"""Check some different types with custom comparator."""
|
||||
@@ -439,6 +506,8 @@ class MessageTest(BaseTestCase):
|
||||
self.assertEqual(message.repeated_nested_message[3].bb, 4)
|
||||
self.assertEqual(message.repeated_nested_message[4].bb, 5)
|
||||
self.assertEqual(message.repeated_nested_message[5].bb, 6)
|
||||
self.assertEqual(str(message.repeated_nested_message),
|
||||
'[bb: 1\n, bb: 2\n, bb: 3\n, bb: 4\n, bb: 5\n, bb: 6\n]')
|
||||
|
||||
def testSortingRepeatedCompositeFieldsStable(self, message_module):
|
||||
"""Check passing a custom comparator to sort a repeated composite field."""
|
||||
@@ -564,6 +633,13 @@ class MessageTest(BaseTestCase):
|
||||
self.assertIsInstance(m.repeated_nested_message,
|
||||
collections.MutableSequence)
|
||||
|
||||
def testRepeatedFieldsNotHashable(self, message_module):
|
||||
m = message_module.TestAllTypes()
|
||||
with self.assertRaises(TypeError):
|
||||
hash(m.repeated_int32)
|
||||
with self.assertRaises(TypeError):
|
||||
hash(m.repeated_nested_message)
|
||||
|
||||
def testRepeatedFieldInsideNestedMessage(self, message_module):
|
||||
m = message_module.NestedTestAllTypes()
|
||||
m.payload.repeated_int32.extend([])
|
||||
@@ -581,6 +657,7 @@ class MessageTest(BaseTestCase):
|
||||
def testOneofGetCaseNonexistingField(self, message_module):
|
||||
m = message_module.TestAllTypes()
|
||||
self.assertRaises(ValueError, m.WhichOneof, 'no_such_oneof_field')
|
||||
self.assertRaises(Exception, m.WhichOneof, 0)
|
||||
|
||||
def testOneofDefaultValues(self, message_module):
|
||||
m = message_module.TestAllTypes()
|
||||
@@ -956,6 +1033,8 @@ class MessageTest(BaseTestCase):
|
||||
m = message_module.TestAllTypes()
|
||||
with self.assertRaises(IndexError) as _:
|
||||
m.repeated_nested_message.pop()
|
||||
with self.assertRaises(TypeError) as _:
|
||||
m.repeated_nested_message.pop('0')
|
||||
for i in range(5):
|
||||
n = m.repeated_nested_message.add()
|
||||
n.bb = i
|
||||
@@ -964,6 +1043,39 @@ class MessageTest(BaseTestCase):
|
||||
self.assertEqual(2, m.repeated_nested_message.pop(1).bb)
|
||||
self.assertEqual([1, 3], [n.bb for n in m.repeated_nested_message])
|
||||
|
||||
def testRepeatedCompareWithSelf(self, message_module):
|
||||
m = message_module.TestAllTypes()
|
||||
for i in range(5):
|
||||
m.repeated_int32.insert(i, i)
|
||||
n = m.repeated_nested_message.add()
|
||||
n.bb = i
|
||||
self.assertSequenceEqual(m.repeated_int32, m.repeated_int32)
|
||||
self.assertEqual(m.repeated_nested_message, m.repeated_nested_message)
|
||||
|
||||
def testReleasedNestedMessages(self, message_module):
|
||||
"""A case that lead to a segfault when a message detached from its parent
|
||||
container has itself a child container.
|
||||
"""
|
||||
m = message_module.NestedTestAllTypes()
|
||||
m = m.repeated_child.add()
|
||||
m = m.child
|
||||
m = m.repeated_child.add()
|
||||
self.assertEqual(m.payload.optional_int32, 0)
|
||||
|
||||
def testSetRepeatedComposite(self, message_module):
|
||||
m = message_module.TestAllTypes()
|
||||
with self.assertRaises(AttributeError):
|
||||
m.repeated_int32 = []
|
||||
m.repeated_int32.append(1)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# For test coverage: cpp has a different path if composite
|
||||
# field is in cache
|
||||
with self.assertRaises(TypeError):
|
||||
m.repeated_int32 = []
|
||||
else:
|
||||
with self.assertRaises(AttributeError):
|
||||
m.repeated_int32 = []
|
||||
|
||||
|
||||
# Class to test proto2-only features (required, extensions, etc.)
|
||||
class Proto2Test(BaseTestCase):
|
||||
@@ -1016,18 +1128,46 @@ class Proto2Test(BaseTestCase):
|
||||
self.assertEqual(False, message.optional_bool)
|
||||
self.assertEqual(0, message.optional_nested_message.bb)
|
||||
|
||||
# TODO(tibell): The C++ implementations actually allows assignment
|
||||
# of unknown enum values to *scalar* fields (but not repeated
|
||||
# fields). Once checked enum fields becomes the default in the
|
||||
# Python implementation, the C++ implementation should follow suit.
|
||||
def testAssignInvalidEnum(self):
|
||||
"""It should not be possible to assign an invalid enum number to an
|
||||
enum field."""
|
||||
"""Assigning an invalid enum number is not allowed in proto2."""
|
||||
m = unittest_pb2.TestAllTypes()
|
||||
|
||||
# Proto2 can not assign unknown enum.
|
||||
with self.assertRaises(ValueError) as _:
|
||||
m.optional_nested_enum = 1234567
|
||||
self.assertRaises(ValueError, m.repeated_nested_enum.append, 1234567)
|
||||
# Assignment is a different code path than append for the C++ impl.
|
||||
m.repeated_nested_enum.append(2)
|
||||
m.repeated_nested_enum[0] = 2
|
||||
with self.assertRaises(ValueError):
|
||||
m.repeated_nested_enum[0] = 123456
|
||||
|
||||
# Unknown enum value can be parsed but is ignored.
|
||||
m2 = unittest_proto3_arena_pb2.TestAllTypes()
|
||||
m2.optional_nested_enum = 1234567
|
||||
m2.repeated_nested_enum.append(7654321)
|
||||
serialized = m2.SerializeToString()
|
||||
|
||||
m3 = unittest_pb2.TestAllTypes()
|
||||
m3.ParseFromString(serialized)
|
||||
self.assertFalse(m3.HasField('optional_nested_enum'))
|
||||
# 1 is the default value for optional_nested_enum.
|
||||
self.assertEqual(1, m3.optional_nested_enum)
|
||||
self.assertEqual(0, len(m3.repeated_nested_enum))
|
||||
m2.Clear()
|
||||
m2.ParseFromString(m3.SerializeToString())
|
||||
self.assertEqual(1234567, m2.optional_nested_enum)
|
||||
self.assertEqual(7654321, m2.repeated_nested_enum[0])
|
||||
|
||||
def testUnknownEnumMap(self):
|
||||
m = map_proto2_unittest_pb2.TestEnumMap()
|
||||
m.known_map_field[123] = 0
|
||||
with self.assertRaises(ValueError):
|
||||
m.unknown_map_field[1] = 123
|
||||
|
||||
def testExtensionsErrors(self):
|
||||
msg = unittest_pb2.TestAllTypes()
|
||||
self.assertRaises(AttributeError, getattr, msg, 'Extensions')
|
||||
|
||||
def testGoldenExtensions(self):
|
||||
golden_data = test_util.GoldenFileData('golden_message')
|
||||
@@ -1252,6 +1392,7 @@ class Proto3Test(BaseTestCase):
|
||||
"""Assigning an unknown enum value is allowed and preserves the value."""
|
||||
m = unittest_proto3_arena_pb2.TestAllTypes()
|
||||
|
||||
# Proto3 can assign unknown enums.
|
||||
m.optional_nested_enum = 1234567
|
||||
self.assertEqual(1234567, m.optional_nested_enum)
|
||||
m.repeated_nested_enum.append(22334455)
|
||||
@@ -1269,7 +1410,7 @@ class Proto3Test(BaseTestCase):
|
||||
# Map isn't really a proto3-only feature. But there is no proto2 equivalent
|
||||
# of google/protobuf/map_unittest.proto right now, so it's not easy to
|
||||
# test both with the same test like we do for the other proto2/proto3 tests.
|
||||
# (google/protobuf/map_protobuf_unittest.proto is very different in the set
|
||||
# (google/protobuf/map_proto2_unittest.proto is very different in the set
|
||||
# of messages and fields it contains).
|
||||
def testScalarMapDefaults(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1330,12 +1471,21 @@ class Proto3Test(BaseTestCase):
|
||||
|
||||
msg.map_int32_int32[5] = 15
|
||||
self.assertEqual(15, msg.map_int32_int32.get(5))
|
||||
self.assertEqual(15, msg.map_int32_int32.get(5))
|
||||
with self.assertRaises(TypeError):
|
||||
msg.map_int32_int32.get('')
|
||||
|
||||
self.assertIsNone(msg.map_int32_foreign_message.get(5))
|
||||
self.assertEqual(10, msg.map_int32_foreign_message.get(5, 10))
|
||||
|
||||
submsg = msg.map_int32_foreign_message[5]
|
||||
self.assertIs(submsg, msg.map_int32_foreign_message.get(5))
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
if api_implementation.Type() == 'cpp':
|
||||
with self.assertRaises(TypeError):
|
||||
msg.map_int32_foreign_message.get('')
|
||||
else:
|
||||
self.assertEqual(None, msg.map_int32_foreign_message.get(''))
|
||||
|
||||
def testScalarMap(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1347,8 +1497,13 @@ class Proto3Test(BaseTestCase):
|
||||
msg.map_int64_int64[-2**33] = -2**34
|
||||
msg.map_uint32_uint32[123] = 456
|
||||
msg.map_uint64_uint64[2**33] = 2**34
|
||||
msg.map_int32_float[2] = 1.2
|
||||
msg.map_int32_double[1] = 3.3
|
||||
msg.map_string_string['abc'] = '123'
|
||||
msg.map_bool_bool[True] = True
|
||||
msg.map_int32_enum[888] = 2
|
||||
# Unknown numeric enum is supported in proto3.
|
||||
msg.map_int32_enum[123] = 456
|
||||
|
||||
self.assertEqual([], msg.FindInitializationErrors())
|
||||
|
||||
@@ -1382,8 +1537,24 @@ class Proto3Test(BaseTestCase):
|
||||
self.assertEqual(-2**34, msg2.map_int64_int64[-2**33])
|
||||
self.assertEqual(456, msg2.map_uint32_uint32[123])
|
||||
self.assertEqual(2**34, msg2.map_uint64_uint64[2**33])
|
||||
self.assertAlmostEqual(1.2, msg.map_int32_float[2])
|
||||
self.assertEqual(3.3, msg.map_int32_double[1])
|
||||
self.assertEqual('123', msg2.map_string_string['abc'])
|
||||
self.assertEqual(True, msg2.map_bool_bool[True])
|
||||
self.assertEqual(2, msg2.map_int32_enum[888])
|
||||
self.assertEqual(456, msg2.map_int32_enum[123])
|
||||
# TODO(jieluo): Add cpp extension support.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertEqual('{-123: -456}',
|
||||
str(msg2.map_int32_int32))
|
||||
|
||||
def testMapEntryAlwaysSerialized(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_int32_int32[0] = 0
|
||||
msg.map_string_string[''] = ''
|
||||
self.assertEqual(msg.ByteSize(), 12)
|
||||
self.assertEqual(b'\n\x04\x08\x00\x10\x00r\x04\n\x00\x12\x00',
|
||||
msg.SerializeToString())
|
||||
|
||||
def testStringUnicodeConversionInMap(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1436,6 +1607,28 @@ class Proto3Test(BaseTestCase):
|
||||
self.assertIn(123, msg2.map_int32_foreign_message)
|
||||
self.assertIn(-456, msg2.map_int32_foreign_message)
|
||||
self.assertEqual(2, len(msg2.map_int32_foreign_message))
|
||||
# TODO(jieluo): Fix text format for message map.
|
||||
# TODO(jieluo): Add cpp extension support.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertEqual(15,
|
||||
len(str(msg2.map_int32_foreign_message)))
|
||||
|
||||
def testNestedMessageMapItemDelete(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_int32_all_types[1].optional_nested_message.bb = 1
|
||||
del msg.map_int32_all_types[1]
|
||||
msg.map_int32_all_types[2].optional_nested_message.bb = 2
|
||||
self.assertEqual(1, len(msg.map_int32_all_types))
|
||||
msg.map_int32_all_types[1].optional_nested_message.bb = 1
|
||||
self.assertEqual(2, len(msg.map_int32_all_types))
|
||||
|
||||
serialized = msg.SerializeToString()
|
||||
msg2 = map_unittest_pb2.TestMap()
|
||||
msg2.ParseFromString(serialized)
|
||||
keys = [1, 2]
|
||||
# The loop triggers PyErr_Occurred() in c extension.
|
||||
for key in keys:
|
||||
del msg2.map_int32_all_types[key]
|
||||
|
||||
def testMapByteSize(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1502,6 +1695,12 @@ class Proto3Test(BaseTestCase):
|
||||
|
||||
del msg2.map_int32_foreign_message[222]
|
||||
self.assertFalse(222 in msg2.map_int32_foreign_message)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
with self.assertRaises(TypeError):
|
||||
del msg2.map_int32_foreign_message['']
|
||||
else:
|
||||
with self.assertRaises(KeyError):
|
||||
del msg2.map_int32_foreign_message['']
|
||||
|
||||
def testMergeFromBadType(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1636,6 +1835,54 @@ class Proto3Test(BaseTestCase):
|
||||
matching_dict = {2: 4, 3: 6, 4: 8}
|
||||
self.assertMapIterEquals(msg.map_int32_int32.items(), matching_dict)
|
||||
|
||||
def testPython2Map(self):
|
||||
if sys.version_info < (3,):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_int32_int32[2] = 4
|
||||
msg.map_int32_int32[3] = 6
|
||||
msg.map_int32_int32[4] = 8
|
||||
msg.map_int32_int32[5] = 10
|
||||
map_int32 = msg.map_int32_int32
|
||||
self.assertEqual(4, len(map_int32))
|
||||
msg2 = map_unittest_pb2.TestMap()
|
||||
msg2.ParseFromString(msg.SerializeToString())
|
||||
|
||||
def CheckItems(seq, iterator):
|
||||
self.assertEqual(next(iterator), seq[0])
|
||||
self.assertEqual(list(iterator), seq[1:])
|
||||
|
||||
CheckItems(map_int32.items(), map_int32.iteritems())
|
||||
CheckItems(map_int32.keys(), map_int32.iterkeys())
|
||||
CheckItems(map_int32.values(), map_int32.itervalues())
|
||||
|
||||
self.assertEqual(6, map_int32.get(3))
|
||||
self.assertEqual(None, map_int32.get(999))
|
||||
self.assertEqual(6, map_int32.pop(3))
|
||||
self.assertEqual(0, map_int32.pop(3))
|
||||
self.assertEqual(3, len(map_int32))
|
||||
key, value = map_int32.popitem()
|
||||
self.assertEqual(2 * key, value)
|
||||
self.assertEqual(2, len(map_int32))
|
||||
map_int32.clear()
|
||||
self.assertEqual(0, len(map_int32))
|
||||
|
||||
with self.assertRaises(KeyError):
|
||||
map_int32.popitem()
|
||||
|
||||
self.assertEqual(0, map_int32.setdefault(2))
|
||||
self.assertEqual(1, len(map_int32))
|
||||
|
||||
map_int32.update(msg2.map_int32_int32)
|
||||
self.assertEqual(4, len(map_int32))
|
||||
|
||||
with self.assertRaises(TypeError):
|
||||
map_int32.update(msg2.map_int32_int32,
|
||||
msg2.map_int32_int32)
|
||||
with self.assertRaises(TypeError):
|
||||
map_int32.update(0)
|
||||
with self.assertRaises(TypeError):
|
||||
map_int32.update(value=12)
|
||||
|
||||
def testMapItems(self):
|
||||
# Map items used to have strange behaviors when use c extension. Because
|
||||
# [] may reorder the map and invalidate any exsting iterators.
|
||||
@@ -1651,6 +1898,35 @@ class Proto3Test(BaseTestCase):
|
||||
items2 = msg.map_string_string.items()
|
||||
self.assertEqual(items1, items2)
|
||||
|
||||
def testMapDeterministicSerialization(self):
|
||||
golden_data = (b'r\x0c\n\x07init_op\x12\x01d'
|
||||
b'r\n\n\x05item1\x12\x01e'
|
||||
b'r\n\n\x05item2\x12\x01f'
|
||||
b'r\n\n\x05item3\x12\x01g'
|
||||
b'r\x0b\n\x05item4\x12\x02QQ'
|
||||
b'r\x12\n\rlocal_init_op\x12\x01a'
|
||||
b'r\x0e\n\tsummaries\x12\x01e'
|
||||
b'r\x18\n\x13trainable_variables\x12\x01b'
|
||||
b'r\x0e\n\tvariables\x12\x01c')
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_string_string['local_init_op'] = 'a'
|
||||
msg.map_string_string['trainable_variables'] = 'b'
|
||||
msg.map_string_string['variables'] = 'c'
|
||||
msg.map_string_string['init_op'] = 'd'
|
||||
msg.map_string_string['summaries'] = 'e'
|
||||
msg.map_string_string['item1'] = 'e'
|
||||
msg.map_string_string['item2'] = 'f'
|
||||
msg.map_string_string['item3'] = 'g'
|
||||
msg.map_string_string['item4'] = 'QQ'
|
||||
|
||||
# If deterministic serialization is not working correctly, this will be
|
||||
# "flaky" depending on the exact python dict hash seed.
|
||||
#
|
||||
# Fortunately, there are enough items in this map that it is extremely
|
||||
# unlikely to ever hit the "right" in-order combination, so the test
|
||||
# itself should fail reliably.
|
||||
self.assertEqual(golden_data, msg.SerializeToString(deterministic=True))
|
||||
|
||||
def testMapIterationClearMessage(self):
|
||||
# Iterator needs to work even if message and map are deleted.
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1737,6 +2013,9 @@ class Proto3Test(BaseTestCase):
|
||||
del msg.map_int32_int32[4]
|
||||
self.assertEqual(0, len(msg.map_int32_int32))
|
||||
|
||||
with self.assertRaises(KeyError):
|
||||
del msg.map_int32_all_types[32]
|
||||
|
||||
def testMapsAreMapping(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
self.assertIsInstance(msg.map_int32_int32, collections.Mapping)
|
||||
@@ -1745,6 +2024,14 @@ class Proto3Test(BaseTestCase):
|
||||
self.assertIsInstance(msg.map_int32_foreign_message,
|
||||
collections.MutableMapping)
|
||||
|
||||
def testMapsCompare(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_int32_int32[-123] = -456
|
||||
self.assertEqual(msg.map_int32_int32, msg.map_int32_int32)
|
||||
self.assertEqual(msg.map_int32_foreign_message,
|
||||
msg.map_int32_foreign_message)
|
||||
self.assertNotEqual(msg.map_int32_int32, 0)
|
||||
|
||||
def testMapFindInitializationErrorsSmokeTest(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_string_string['abc'] = '123'
|
||||
@@ -1832,8 +2119,9 @@ class PackedFieldTest(BaseTestCase):
|
||||
self.assertEqual(golden_data, message.SerializeToString())
|
||||
|
||||
|
||||
@unittest.skipIf(api_implementation.Type() != 'cpp',
|
||||
'explicit tests of the C++ implementation')
|
||||
@unittest.skipIf(api_implementation.Type() != 'cpp' or
|
||||
sys.version_info < (2, 7),
|
||||
'explicit tests of the C++ implementation for PY27 and above')
|
||||
class OversizeProtosTest(BaseTestCase):
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -78,21 +78,21 @@ _TESTENUMVALUES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='google.protobuf.python.internal.TestEnumValues.repeated_nested_enum', index=1,
|
||||
number=2, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_nested_enum', full_name='google.protobuf.python.internal.TestEnumValues.packed_nested_enum', index=2,
|
||||
number=3, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -124,21 +124,21 @@ _TESTMISSINGENUMVALUES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=2,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='google.protobuf.python.internal.TestMissingEnumValues.repeated_nested_enum', index=1,
|
||||
number=2, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_nested_enum', full_name='google.protobuf.python.internal.TestMissingEnumValues.packed_nested_enum', index=2,
|
||||
number=3, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -170,7 +170,7 @@ _JUSTSTRING = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -47,4 +47,5 @@ message DynamicMessageType {
|
||||
extend ExtendedMessage {
|
||||
optional int32 dynamic_int32_extension = 100;
|
||||
optional DynamicMessageType dynamic_message_extension = 101;
|
||||
repeated DynamicMessageType repeated_dynamic_message_extension = 102;
|
||||
}
|
||||
@@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/more_extensions_dynamic.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_pb=_b('\n6google/protobuf/internal/more_extensions_dynamic.proto\x12\x18google.protobuf.internal\x1a.google/protobuf/internal/more_extensions.proto\"\x1f\n\x12\x44ynamicMessageType\x12\t\n\x01\x61\x18\x01 \x01(\x05:J\n\x17\x64ynamic_int32_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x64 \x01(\x05:z\n\x19\x64ynamic_message_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x65 \x01(\x0b\x32,.google.protobuf.internal.DynamicMessageType')
|
||||
serialized_pb=_b('\n6google/protobuf/internal/more_extensions_dynamic.proto\x12\x18google.protobuf.internal\x1a.google/protobuf/internal/more_extensions.proto\"\x1f\n\x12\x44ynamicMessageType\x12\t\n\x01\x61\x18\x01 \x01(\x05:J\n\x17\x64ynamic_int32_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x64 \x01(\x05:z\n\x19\x64ynamic_message_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x65 \x01(\x0b\x32,.google.protobuf.internal.DynamicMessageType:\x83\x01\n\"repeated_dynamic_message_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x66 \x03(\x0b\x32,.google.protobuf.internal.DynamicMessageType')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_internal_dot_more__extensions__pb2.DESCRIPTOR,])
|
||||
|
||||
@@ -32,7 +32,7 @@ dynamic_int32_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
DYNAMIC_MESSAGE_EXTENSION_FIELD_NUMBER = 101
|
||||
dynamic_message_extension = _descriptor.FieldDescriptor(
|
||||
name='dynamic_message_extension', full_name='google.protobuf.internal.dynamic_message_extension', index=1,
|
||||
@@ -40,7 +40,15 @@ dynamic_message_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
REPEATED_DYNAMIC_MESSAGE_EXTENSION_FIELD_NUMBER = 102
|
||||
repeated_dynamic_message_extension = _descriptor.FieldDescriptor(
|
||||
name='repeated_dynamic_message_extension', full_name='google.protobuf.internal.repeated_dynamic_message_extension', index=2,
|
||||
number=102, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_DYNAMICMESSAGETYPE = _descriptor.Descriptor(
|
||||
@@ -56,7 +64,7 @@ _DYNAMICMESSAGETYPE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -76,6 +84,7 @@ _DYNAMICMESSAGETYPE = _descriptor.Descriptor(
|
||||
DESCRIPTOR.message_types_by_name['DynamicMessageType'] = _DYNAMICMESSAGETYPE
|
||||
DESCRIPTOR.extensions_by_name['dynamic_int32_extension'] = dynamic_int32_extension
|
||||
DESCRIPTOR.extensions_by_name['dynamic_message_extension'] = dynamic_message_extension
|
||||
DESCRIPTOR.extensions_by_name['repeated_dynamic_message_extension'] = repeated_dynamic_message_extension
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
DynamicMessageType = _reflection.GeneratedProtocolMessageType('DynamicMessageType', (_message.Message,), dict(
|
||||
@@ -88,5 +97,7 @@ _sym_db.RegisterMessage(DynamicMessageType)
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(dynamic_int32_extension)
|
||||
dynamic_message_extension.message_type = _DYNAMICMESSAGETYPE
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(dynamic_message_extension)
|
||||
repeated_dynamic_message_extension.message_type = _DYNAMICMESSAGETYPE
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(repeated_dynamic_message_extension)
|
||||
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -30,7 +30,7 @@ optional_int_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
OPTIONAL_MESSAGE_EXTENSION_FIELD_NUMBER = 2
|
||||
optional_message_extension = _descriptor.FieldDescriptor(
|
||||
name='optional_message_extension', full_name='google.protobuf.internal.optional_message_extension', index=1,
|
||||
@@ -38,7 +38,7 @@ optional_message_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
REPEATED_INT_EXTENSION_FIELD_NUMBER = 3
|
||||
repeated_int_extension = _descriptor.FieldDescriptor(
|
||||
name='repeated_int_extension', full_name='google.protobuf.internal.repeated_int_extension', index=2,
|
||||
@@ -46,7 +46,7 @@ repeated_int_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
REPEATED_MESSAGE_EXTENSION_FIELD_NUMBER = 4
|
||||
repeated_message_extension = _descriptor.FieldDescriptor(
|
||||
name='repeated_message_extension', full_name='google.protobuf.internal.repeated_message_extension', index=3,
|
||||
@@ -54,7 +54,7 @@ repeated_message_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TOPLEVELMESSAGE = _descriptor.Descriptor(
|
||||
@@ -70,7 +70,7 @@ _TOPLEVELMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -125,7 +125,7 @@ _FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -30,7 +30,7 @@ optional_uint64 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
OPTIONAL_INT64_FIELD_NUMBER = 2
|
||||
optional_int64 = _descriptor.FieldDescriptor(
|
||||
name='optional_int64', full_name='google.protobuf.internal.optional_int64', index=1,
|
||||
@@ -38,7 +38,7 @@ optional_int64 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_OUTOFORDERFIELDS = _descriptor.Descriptor(
|
||||
@@ -54,21 +54,21 @@ _OUTOFORDERFIELDS = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_uint32', full_name='google.protobuf.internal.OutOfOrderFields.optional_uint32', index=1,
|
||||
number=3, type=13, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_int32', full_name='google.protobuf.internal.OutOfOrderFields.optional_int32', index=2,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -64,98 +64,98 @@ _TESTPACKEDTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_int64', index=1,
|
||||
number=2, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_uint32', index=2,
|
||||
number=3, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_uint64', index=3,
|
||||
number=4, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint32', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_sint32', index=4,
|
||||
number=5, type=17, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint64', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_sint64', index=5,
|
||||
number=6, type=18, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed32', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_fixed32', index=6,
|
||||
number=7, type=7, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed64', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_fixed64', index=7,
|
||||
number=8, type=6, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed32', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_sfixed32', index=8,
|
||||
number=9, type=15, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed64', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_sfixed64', index=9,
|
||||
number=10, type=16, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_float', index=10,
|
||||
number=11, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_double', index=11,
|
||||
number=12, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_bool', index=12,
|
||||
number=13, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_nested_enum', index=13,
|
||||
number=14, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -187,98 +187,98 @@ _TESTUNPACKEDTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_int64', index=1,
|
||||
number=2, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_uint32', index=2,
|
||||
number=3, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_uint64', index=3,
|
||||
number=4, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint32', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_sint32', index=4,
|
||||
number=5, type=17, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint64', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_sint64', index=5,
|
||||
number=6, type=18, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed32', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_fixed32', index=6,
|
||||
number=7, type=7, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed64', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_fixed64', index=7,
|
||||
number=8, type=6, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed32', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_sfixed32', index=8,
|
||||
number=9, type=15, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed64', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_sfixed64', index=9,
|
||||
number=10, type=16, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_float', index=10,
|
||||
number=11, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_double', index=11,
|
||||
number=12, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_bool', index=12,
|
||||
number=13, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_nested_enum', index=13,
|
||||
number=14, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -620,6 +620,14 @@ class ReflectionTest(BaseTestCase):
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_int32', 'foo')
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_string', 10)
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_bytes', 10)
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_bool', 'foo')
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_float', 'foo')
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_double', 'foo')
|
||||
# TODO(jieluo): Fix type checking difference for python and c extension
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertRaises(TypeError, setattr, proto, 'optional_bool', 1.1)
|
||||
else:
|
||||
proto.optional_bool = 1.1
|
||||
|
||||
def assertIntegerTypes(self, integer_fn):
|
||||
"""Verifies setting of scalar integers.
|
||||
@@ -686,8 +694,10 @@ class ReflectionTest(BaseTestCase):
|
||||
self.assertEqual(expected_min, getattr(pb, field_name))
|
||||
setattr(pb, field_name, expected_max)
|
||||
self.assertEqual(expected_max, getattr(pb, field_name))
|
||||
self.assertRaises(ValueError, setattr, pb, field_name, expected_min - 1)
|
||||
self.assertRaises(ValueError, setattr, pb, field_name, expected_max + 1)
|
||||
self.assertRaises((ValueError, TypeError), setattr, pb, field_name,
|
||||
expected_min - 1)
|
||||
self.assertRaises((ValueError, TypeError), setattr, pb, field_name,
|
||||
expected_max + 1)
|
||||
|
||||
TestMinAndMaxIntegers('optional_int32', -(1 << 31), (1 << 31) - 1)
|
||||
TestMinAndMaxIntegers('optional_uint32', 0, 0xffffffff)
|
||||
@@ -696,7 +706,7 @@ class ReflectionTest(BaseTestCase):
|
||||
# A bit of white-box testing since -1 is an int and not a long in C++ and
|
||||
# so goes down a different path.
|
||||
pb = unittest_pb2.TestAllTypes()
|
||||
with self.assertRaises(ValueError):
|
||||
with self.assertRaises((ValueError, TypeError)):
|
||||
pb.optional_uint64 = integer_fn(-(1 << 63))
|
||||
|
||||
pb = unittest_pb2.TestAllTypes()
|
||||
@@ -720,6 +730,12 @@ class ReflectionTest(BaseTestCase):
|
||||
proto.repeated_int32[0] = 23
|
||||
self.assertRaises(IndexError, proto.repeated_int32.__setitem__, 500, 23)
|
||||
self.assertRaises(TypeError, proto.repeated_int32.__setitem__, 0, 'abc')
|
||||
self.assertRaises(TypeError, proto.repeated_int32.__setitem__, 0, [])
|
||||
self.assertRaises(TypeError, proto.repeated_int32.__setitem__,
|
||||
'index', 23)
|
||||
|
||||
proto.repeated_string.append('2')
|
||||
self.assertRaises(TypeError, proto.repeated_string.__setitem__, 0, 10)
|
||||
|
||||
# Repeated enums tests.
|
||||
#proto.repeated_nested_enum.append(0)
|
||||
@@ -1007,6 +1023,14 @@ class ReflectionTest(BaseTestCase):
|
||||
self.assertEqual(4, len(proto.repeated_nested_message))
|
||||
self.assertEqual(n1, proto.repeated_nested_message[2])
|
||||
self.assertEqual(n2, proto.repeated_nested_message[3])
|
||||
self.assertRaises(TypeError,
|
||||
proto.repeated_nested_message.extend, n1)
|
||||
self.assertRaises(TypeError,
|
||||
proto.repeated_nested_message.extend, [0])
|
||||
wrong_message_type = unittest_pb2.TestAllTypes()
|
||||
self.assertRaises(TypeError,
|
||||
proto.repeated_nested_message.extend,
|
||||
[wrong_message_type])
|
||||
|
||||
# Test clearing.
|
||||
proto.ClearField('repeated_nested_message')
|
||||
@@ -1018,6 +1042,8 @@ class ReflectionTest(BaseTestCase):
|
||||
self.assertEqual(1, len(proto.repeated_nested_message))
|
||||
self.assertEqual(23, proto.repeated_nested_message[0].bb)
|
||||
self.assertRaises(TypeError, proto.repeated_nested_message.add, 23)
|
||||
with self.assertRaises(Exception):
|
||||
proto.repeated_nested_message[0] = 23
|
||||
|
||||
def testRepeatedCompositeRemove(self):
|
||||
proto = unittest_pb2.TestAllTypes()
|
||||
@@ -1642,8 +1668,11 @@ class ReflectionTest(BaseTestCase):
|
||||
proto.SerializeToString()
|
||||
proto.SerializePartialToString()
|
||||
|
||||
def assertNotInitialized(self, proto):
|
||||
def assertNotInitialized(self, proto, error_size=None):
|
||||
errors = []
|
||||
self.assertFalse(proto.IsInitialized())
|
||||
self.assertFalse(proto.IsInitialized(errors))
|
||||
self.assertEqual(error_size, len(errors))
|
||||
self.assertRaises(message.EncodeError, proto.SerializeToString)
|
||||
# "Partial" serialization doesn't care if message is uninitialized.
|
||||
proto.SerializePartialToString()
|
||||
@@ -1657,7 +1686,7 @@ class ReflectionTest(BaseTestCase):
|
||||
|
||||
# The case of uninitialized required fields.
|
||||
proto = unittest_pb2.TestRequired()
|
||||
self.assertNotInitialized(proto)
|
||||
self.assertNotInitialized(proto, 3)
|
||||
proto.a = proto.b = proto.c = 2
|
||||
self.assertInitialized(proto)
|
||||
|
||||
@@ -1665,14 +1694,14 @@ class ReflectionTest(BaseTestCase):
|
||||
proto = unittest_pb2.TestRequiredForeign()
|
||||
self.assertInitialized(proto)
|
||||
proto.optional_message.a = 1
|
||||
self.assertNotInitialized(proto)
|
||||
self.assertNotInitialized(proto, 2)
|
||||
proto.optional_message.b = 0
|
||||
proto.optional_message.c = 0
|
||||
self.assertInitialized(proto)
|
||||
|
||||
# Uninitialized repeated submessage.
|
||||
message1 = proto.repeated_message.add()
|
||||
self.assertNotInitialized(proto)
|
||||
self.assertNotInitialized(proto, 3)
|
||||
message1.a = message1.b = message1.c = 0
|
||||
self.assertInitialized(proto)
|
||||
|
||||
@@ -1681,11 +1710,11 @@ class ReflectionTest(BaseTestCase):
|
||||
extension = unittest_pb2.TestRequired.multi
|
||||
message1 = proto.Extensions[extension].add()
|
||||
message2 = proto.Extensions[extension].add()
|
||||
self.assertNotInitialized(proto)
|
||||
self.assertNotInitialized(proto, 6)
|
||||
message1.a = 1
|
||||
message1.b = 1
|
||||
message1.c = 1
|
||||
self.assertNotInitialized(proto)
|
||||
self.assertNotInitialized(proto, 3)
|
||||
message2.a = 2
|
||||
message2.b = 2
|
||||
message2.c = 2
|
||||
@@ -1695,7 +1724,7 @@ class ReflectionTest(BaseTestCase):
|
||||
proto = unittest_pb2.TestAllExtensions()
|
||||
extension = unittest_pb2.TestRequired.single
|
||||
proto.Extensions[extension].a = 1
|
||||
self.assertNotInitialized(proto)
|
||||
self.assertNotInitialized(proto, 2)
|
||||
proto.Extensions[extension].b = 2
|
||||
proto.Extensions[extension].c = 3
|
||||
self.assertInitialized(proto)
|
||||
@@ -2154,6 +2183,8 @@ class ByteSizeTest(BaseTestCase):
|
||||
foreign_message_1 = self.proto.repeated_nested_message.add()
|
||||
foreign_message_1.bb = 9
|
||||
self.assertEqual(2 + 1 + 2 + 1 + 1 + 1, self.Size())
|
||||
repeated_nested_message = copy.deepcopy(
|
||||
self.proto.repeated_nested_message)
|
||||
|
||||
# 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
|
||||
del self.proto.repeated_nested_message[0]
|
||||
@@ -2174,6 +2205,16 @@ class ByteSizeTest(BaseTestCase):
|
||||
del self.proto.repeated_nested_message[0]
|
||||
self.assertEqual(0, self.Size())
|
||||
|
||||
self.assertEqual(2, len(repeated_nested_message))
|
||||
del repeated_nested_message[0:1]
|
||||
# TODO(jieluo): Fix cpp extension bug when delete repeated message.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertEqual(1, len(repeated_nested_message))
|
||||
del repeated_nested_message[-1]
|
||||
# TODO(jieluo): Fix cpp extension bug when delete repeated message.
|
||||
if api_implementation.Type() == 'python':
|
||||
self.assertEqual(0, len(repeated_nested_message))
|
||||
|
||||
def testRepeatedGroups(self):
|
||||
# 2-byte START_GROUP plus 2-byte END_GROUP.
|
||||
group_0 = self.proto.repeatedgroup.add()
|
||||
@@ -2190,6 +2231,10 @@ class ByteSizeTest(BaseTestCase):
|
||||
proto.Extensions[extension] = 23
|
||||
# 1 byte for tag, 1 byte for value.
|
||||
self.assertEqual(2, proto.ByteSize())
|
||||
field = unittest_pb2.TestAllTypes.DESCRIPTOR.fields_by_name[
|
||||
'optional_int32']
|
||||
with self.assertRaises(KeyError):
|
||||
proto.Extensions[field] = 23
|
||||
|
||||
def testCacheInvalidationForNonrepeatedScalar(self):
|
||||
# Test non-extension.
|
||||
|
||||
@@ -82,6 +82,10 @@ class FooUnitTest(unittest.TestCase):
|
||||
service_descriptor = unittest_pb2.TestService.GetDescriptor()
|
||||
srvc.CallMethod(service_descriptor.methods[1], rpc_controller,
|
||||
unittest_pb2.BarRequest(), MyCallback)
|
||||
self.assertTrue(srvc.GetRequestClass(service_descriptor.methods[1]) is
|
||||
unittest_pb2.BarRequest)
|
||||
self.assertTrue(srvc.GetResponseClass(service_descriptor.methods[1]) is
|
||||
unittest_pb2.BarResponse)
|
||||
self.assertEqual('Method Bar not implemented.',
|
||||
rpc_controller.failure_message)
|
||||
self.assertEqual(None, self.callback_response)
|
||||
|
||||
@@ -32,7 +32,7 @@ message = _descriptor.FieldDescriptor(
|
||||
has_default_value=True, default_value=_b("foo").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
DESCRIPTOR_FIELD_NUMBER = 101
|
||||
descriptor = _descriptor.FieldDescriptor(
|
||||
name='descriptor', full_name='protobuf_unittest.descriptor', index=1,
|
||||
@@ -40,7 +40,7 @@ descriptor = _descriptor.FieldDescriptor(
|
||||
has_default_value=True, default_value=_b("bar").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
REFLECTION_FIELD_NUMBER = 102
|
||||
reflection = _descriptor.FieldDescriptor(
|
||||
name='reflection', full_name='protobuf_unittest.reflection', index=2,
|
||||
@@ -48,7 +48,7 @@ reflection = _descriptor.FieldDescriptor(
|
||||
has_default_value=True, default_value=_b("baz").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SERVICE_FIELD_NUMBER = 103
|
||||
service = _descriptor.FieldDescriptor(
|
||||
name='service', full_name='protobuf_unittest.service', index=3,
|
||||
@@ -56,7 +56,7 @@ service = _descriptor.FieldDescriptor(
|
||||
has_default_value=True, default_value=_b("qux").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTBADIDENTIFIERS = _descriptor.Descriptor(
|
||||
@@ -146,6 +146,9 @@ _ANOTHERSERVICE = _descriptor.ServiceDescriptor(
|
||||
serialized_end=140,
|
||||
methods=[
|
||||
])
|
||||
_sym_db.RegisterServiceDescriptor(_ANOTHERSERVICE)
|
||||
|
||||
DESCRIPTOR.services_by_name['AnotherService'] = _ANOTHERSERVICE
|
||||
|
||||
AnotherService = service_reflection.GeneratedServiceType('AnotherService', (_service.Service,), dict(
|
||||
DESCRIPTOR = _ANOTHERSERVICE,
|
||||
|
||||
@@ -39,11 +39,15 @@ __author__ = 'robinson@google.com (Will Robinson)'
|
||||
import numbers
|
||||
import operator
|
||||
import os.path
|
||||
import sys
|
||||
|
||||
from google.protobuf import unittest_import_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import descriptor_pb2
|
||||
|
||||
try:
|
||||
long # Python 2
|
||||
except NameError:
|
||||
long = int # Python 3
|
||||
|
||||
|
||||
# Tests whether the given TestAllTypes message is proto2 or not.
|
||||
# This is used to gate several fields/features that only exist
|
||||
@@ -51,6 +55,7 @@ from google.protobuf import descriptor_pb2
|
||||
def IsProto2(message):
|
||||
return message.DESCRIPTOR.syntax == "proto2"
|
||||
|
||||
|
||||
def SetAllNonLazyFields(message):
|
||||
"""Sets every non-lazy field in the message to a unique value.
|
||||
|
||||
@@ -128,22 +133,37 @@ def SetAllNonLazyFields(message):
|
||||
message.repeated_string_piece.append(u'224')
|
||||
message.repeated_cord.append(u'225')
|
||||
|
||||
# Add a second one of each field.
|
||||
message.repeated_int32.append(301)
|
||||
message.repeated_int64.append(302)
|
||||
message.repeated_uint32.append(303)
|
||||
message.repeated_uint64.append(304)
|
||||
message.repeated_sint32.append(305)
|
||||
message.repeated_sint64.append(306)
|
||||
message.repeated_fixed32.append(307)
|
||||
message.repeated_fixed64.append(308)
|
||||
message.repeated_sfixed32.append(309)
|
||||
message.repeated_sfixed64.append(310)
|
||||
message.repeated_float.append(311)
|
||||
message.repeated_double.append(312)
|
||||
message.repeated_bool.append(False)
|
||||
message.repeated_string.append(u'315')
|
||||
message.repeated_bytes.append(b'316')
|
||||
# Add a second one of each field and set value by index.
|
||||
message.repeated_int32.append(0)
|
||||
message.repeated_int64.append(0)
|
||||
message.repeated_uint32.append(0)
|
||||
message.repeated_uint64.append(0)
|
||||
message.repeated_sint32.append(0)
|
||||
message.repeated_sint64.append(0)
|
||||
message.repeated_fixed32.append(0)
|
||||
message.repeated_fixed64.append(0)
|
||||
message.repeated_sfixed32.append(0)
|
||||
message.repeated_sfixed64.append(0)
|
||||
message.repeated_float.append(0)
|
||||
message.repeated_double.append(0)
|
||||
message.repeated_bool.append(True)
|
||||
message.repeated_string.append(u'0')
|
||||
message.repeated_bytes.append(b'0')
|
||||
message.repeated_int32[1] = 301
|
||||
message.repeated_int64[1] = 302
|
||||
message.repeated_uint32[1] = 303
|
||||
message.repeated_uint64[1] = 304
|
||||
message.repeated_sint32[1] = 305
|
||||
message.repeated_sint64[1] = 306
|
||||
message.repeated_fixed32[1] = 307
|
||||
message.repeated_fixed64[1] = 308
|
||||
message.repeated_sfixed32[1] = 309
|
||||
message.repeated_sfixed64[1] = 310
|
||||
message.repeated_float[1] = 311
|
||||
message.repeated_double[1] = 312
|
||||
message.repeated_bool[1] = False
|
||||
message.repeated_string[1] = u'315'
|
||||
message.repeated_bytes[1] = b'316'
|
||||
|
||||
if IsProto2(message):
|
||||
message.repeatedgroup.add().a = 317
|
||||
@@ -152,7 +172,8 @@ def SetAllNonLazyFields(message):
|
||||
message.repeated_import_message.add().d = 320
|
||||
message.repeated_lazy_message.add().bb = 327
|
||||
|
||||
message.repeated_nested_enum.append(unittest_pb2.TestAllTypes.BAZ)
|
||||
message.repeated_nested_enum.append(unittest_pb2.TestAllTypes.BAR)
|
||||
message.repeated_nested_enum[1] = unittest_pb2.TestAllTypes.BAZ
|
||||
message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAZ)
|
||||
if IsProto2(message):
|
||||
message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAZ)
|
||||
@@ -707,8 +728,8 @@ class NonStandardInteger(numbers.Integral):
|
||||
NonStandardInteger is the minimal legal specification for a custom Integral.
|
||||
As such, it does not support 0 < x < 5 and it is not hashable.
|
||||
|
||||
Note: This is added here instead of relying on numpy or a similar library with
|
||||
custom integers to limit dependencies.
|
||||
Note: This is added here instead of relying on numpy or a similar library
|
||||
with custom integers to limit dependencies.
|
||||
"""
|
||||
|
||||
def __init__(self, val, error_string_on_conversion=None):
|
||||
@@ -845,4 +866,3 @@ class NonStandardInteger(numbers.Integral):
|
||||
|
||||
def __repr__(self):
|
||||
return 'NonStandardInteger(%s)' % self.val
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#! /usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
@@ -35,6 +36,7 @@
|
||||
__author__ = 'kenton@google.com (Kenton Varda)'
|
||||
|
||||
|
||||
import math
|
||||
import re
|
||||
import six
|
||||
import string
|
||||
@@ -53,8 +55,8 @@ from google.protobuf import unittest_pb2
|
||||
from google.protobuf import unittest_proto3_arena_pb2
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import any_test_pb2 as test_extend_any
|
||||
from google.protobuf.internal import test_util
|
||||
from google.protobuf.internal import message_set_extensions_pb2
|
||||
from google.protobuf.internal import test_util
|
||||
from google.protobuf import descriptor_pool
|
||||
from google.protobuf import text_format
|
||||
|
||||
@@ -297,6 +299,33 @@ class TextFormatTest(TextFormatBase):
|
||||
if message_module is unittest_pb2:
|
||||
test_util.ExpectAllFieldsSet(self, message)
|
||||
|
||||
def testParseAndMergeUtf8(self, message_module):
|
||||
message = message_module.TestAllTypes()
|
||||
test_util.SetAllFields(message)
|
||||
ascii_text = text_format.MessageToString(message)
|
||||
ascii_text = ascii_text.encode('utf-8')
|
||||
|
||||
parsed_message = message_module.TestAllTypes()
|
||||
text_format.Parse(ascii_text, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
if message_module is unittest_pb2:
|
||||
test_util.ExpectAllFieldsSet(self, message)
|
||||
|
||||
parsed_message.Clear()
|
||||
text_format.Merge(ascii_text, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
if message_module is unittest_pb2:
|
||||
test_util.ExpectAllFieldsSet(self, message)
|
||||
|
||||
if six.PY2:
|
||||
msg2 = message_module.TestAllTypes()
|
||||
text = (u'optional_string: "café"')
|
||||
text_format.Merge(text, msg2)
|
||||
self.assertEqual(msg2.optional_string, u'café')
|
||||
msg2.Clear()
|
||||
text_format.Parse(text, msg2)
|
||||
self.assertEqual(msg2.optional_string, u'café')
|
||||
|
||||
def testParseExotic(self, message_module):
|
||||
message = message_module.TestAllTypes()
|
||||
text = ('repeated_int64: -9223372036854775808\n'
|
||||
@@ -371,7 +400,10 @@ class TextFormatTest(TextFormatBase):
|
||||
def testParseInvalidUtf8(self, message_module):
|
||||
message = message_module.TestAllTypes()
|
||||
text = 'repeated_string: "\\xc3\\xc3"'
|
||||
self.assertRaises(text_format.ParseError, text_format.Parse, text, message)
|
||||
with self.assertRaises(text_format.ParseError) as e:
|
||||
text_format.Parse(text, message)
|
||||
self.assertEqual(e.exception.GetLine(), 1)
|
||||
self.assertEqual(e.exception.GetColumn(), 28)
|
||||
|
||||
def testParseSingleWord(self, message_module):
|
||||
message = message_module.TestAllTypes()
|
||||
@@ -395,13 +427,6 @@ class TextFormatTest(TextFormatBase):
|
||||
r'has no value named BARR.'), text_format.Parse,
|
||||
text, message)
|
||||
|
||||
message = message_module.TestAllTypes()
|
||||
text = 'optional_nested_enum: 100'
|
||||
six.assertRaisesRegex(self, text_format.ParseError,
|
||||
(r'1:23 : Enum type "\w+.TestAllTypes.NestedEnum" '
|
||||
r'has no value with number 100.'), text_format.Parse,
|
||||
text, message)
|
||||
|
||||
def testParseBadIntValue(self, message_module):
|
||||
message = message_module.TestAllTypes()
|
||||
text = 'optional_int32: bork'
|
||||
@@ -452,16 +477,18 @@ class TextFormatTest(TextFormatBase):
|
||||
text_format.Parse(text_format.MessageToString(m), m2)
|
||||
self.assertEqual('oneof_uint32', m2.WhichOneof('oneof_field'))
|
||||
|
||||
def testMergeMultipleOneof(self, message_module):
|
||||
m_string = '\n'.join(['oneof_uint32: 11', 'oneof_string: "foo"'])
|
||||
m2 = message_module.TestAllTypes()
|
||||
text_format.Merge(m_string, m2)
|
||||
self.assertEqual('oneof_string', m2.WhichOneof('oneof_field'))
|
||||
|
||||
def testParseMultipleOneof(self, message_module):
|
||||
m_string = '\n'.join(['oneof_uint32: 11', 'oneof_string: "foo"'])
|
||||
m2 = message_module.TestAllTypes()
|
||||
if message_module is unittest_pb2:
|
||||
with self.assertRaisesRegexp(text_format.ParseError,
|
||||
' is specified along with field '):
|
||||
text_format.Parse(m_string, m2)
|
||||
else:
|
||||
with self.assertRaisesRegexp(text_format.ParseError,
|
||||
' is specified along with field '):
|
||||
text_format.Parse(m_string, m2)
|
||||
self.assertEqual('oneof_string', m2.WhichOneof('oneof_field'))
|
||||
|
||||
|
||||
# These are tests that aren't fundamentally specific to proto2, but are at
|
||||
@@ -782,13 +809,14 @@ class Proto2Tests(TextFormatBase):
|
||||
' bin: "\xe0"'
|
||||
' [nested_unknown_ext]: {\n'
|
||||
' i: 23\n'
|
||||
' x: x\n'
|
||||
' test: "test_string"\n'
|
||||
' floaty_float: -0.315\n'
|
||||
' num: -inf\n'
|
||||
' multiline_str: "abc"\n'
|
||||
' "def"\n'
|
||||
' "xyz."\n'
|
||||
' [nested_unknown_ext]: <\n'
|
||||
' [nested_unknown_ext.ext]: <\n'
|
||||
' i: 23\n'
|
||||
' i: 24\n'
|
||||
' pointfloat: .3\n'
|
||||
@@ -894,6 +922,14 @@ class Proto2Tests(TextFormatBase):
|
||||
self.assertEqual(23, message.message_set.Extensions[ext1].i)
|
||||
self.assertEqual('foo', message.message_set.Extensions[ext2].str)
|
||||
|
||||
def testParseBadIdentifier(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
text = ('optional_nested_message { "bb": 1 }')
|
||||
with self.assertRaises(text_format.ParseError) as e:
|
||||
text_format.Parse(text, message)
|
||||
self.assertEqual(str(e.exception),
|
||||
'1:27 : Expected identifier or number, got "bb".')
|
||||
|
||||
def testParseBadExtension(self):
|
||||
message = unittest_pb2.TestAllExtensions()
|
||||
text = '[unknown_extension]: 8\n'
|
||||
@@ -905,6 +941,14 @@ class Proto2Tests(TextFormatBase):
|
||||
'1:2 : Message type "protobuf_unittest.TestAllTypes" does not have '
|
||||
'extensions.'), text_format.Parse, text, message)
|
||||
|
||||
def testParseNumericUnknownEnum(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
text = 'optional_nested_enum: 100'
|
||||
six.assertRaisesRegex(self, text_format.ParseError,
|
||||
(r'1:23 : Enum type "\w+.TestAllTypes.NestedEnum" '
|
||||
r'has no value with number 100.'), text_format.Parse,
|
||||
text, message)
|
||||
|
||||
def testMergeDuplicateExtensionScalars(self):
|
||||
message = unittest_pb2.TestAllExtensions()
|
||||
text = ('[protobuf_unittest.optional_int32_extension]: 42 '
|
||||
@@ -1026,8 +1070,7 @@ class Proto3Tests(unittest.TestCase):
|
||||
packed_message.data = 'string1'
|
||||
message.repeated_any_value.add().Pack(packed_message)
|
||||
self.assertEqual(
|
||||
text_format.MessageToString(message,
|
||||
descriptor_pool=descriptor_pool.Default()),
|
||||
text_format.MessageToString(message),
|
||||
'repeated_any_value {\n'
|
||||
' [type.googleapis.com/protobuf_unittest.OneString] {\n'
|
||||
' data: "string0"\n'
|
||||
@@ -1039,18 +1082,6 @@ class Proto3Tests(unittest.TestCase):
|
||||
' }\n'
|
||||
'}\n')
|
||||
|
||||
def testPrintMessageExpandAnyNoDescriptorPool(self):
|
||||
packed_message = unittest_pb2.OneString()
|
||||
packed_message.data = 'string'
|
||||
message = any_test_pb2.TestAny()
|
||||
message.any_value.Pack(packed_message)
|
||||
self.assertEqual(
|
||||
text_format.MessageToString(message, descriptor_pool=None),
|
||||
'any_value {\n'
|
||||
' type_url: "type.googleapis.com/protobuf_unittest.OneString"\n'
|
||||
' value: "\\n\\006string"\n'
|
||||
'}\n')
|
||||
|
||||
def testPrintMessageExpandAnyDescriptorPoolMissingType(self):
|
||||
packed_message = unittest_pb2.OneString()
|
||||
packed_message.data = 'string'
|
||||
@@ -1071,8 +1102,7 @@ class Proto3Tests(unittest.TestCase):
|
||||
message.any_value.Pack(packed_message)
|
||||
self.assertEqual(
|
||||
text_format.MessageToString(message,
|
||||
pointy_brackets=True,
|
||||
descriptor_pool=descriptor_pool.Default()),
|
||||
pointy_brackets=True),
|
||||
'any_value <\n'
|
||||
' [type.googleapis.com/protobuf_unittest.OneString] <\n'
|
||||
' data: "string"\n'
|
||||
@@ -1086,8 +1116,7 @@ class Proto3Tests(unittest.TestCase):
|
||||
message.any_value.Pack(packed_message)
|
||||
self.assertEqual(
|
||||
text_format.MessageToString(message,
|
||||
as_one_line=True,
|
||||
descriptor_pool=descriptor_pool.Default()),
|
||||
as_one_line=True),
|
||||
'any_value {'
|
||||
' [type.googleapis.com/protobuf_unittest.OneString]'
|
||||
' { data: "string" } '
|
||||
@@ -1108,6 +1137,14 @@ class Proto3Tests(unittest.TestCase):
|
||||
' < data: "string" > '
|
||||
'>')
|
||||
|
||||
def testUnknownEnums(self):
|
||||
message = unittest_proto3_arena_pb2.TestAllTypes()
|
||||
message2 = unittest_proto3_arena_pb2.TestAllTypes()
|
||||
message.optional_nested_enum = 999
|
||||
text_string = text_format.MessageToString(message)
|
||||
text_format.Parse(text_string, message2)
|
||||
self.assertEqual(999, message2.optional_nested_enum)
|
||||
|
||||
def testMergeExpandedAny(self):
|
||||
message = any_test_pb2.TestAny()
|
||||
text = ('any_value {\n'
|
||||
@@ -1115,12 +1152,12 @@ class Proto3Tests(unittest.TestCase):
|
||||
' data: "string"\n'
|
||||
' }\n'
|
||||
'}\n')
|
||||
text_format.Merge(text, message, descriptor_pool=descriptor_pool.Default())
|
||||
text_format.Merge(text, message)
|
||||
packed_message = unittest_pb2.OneString()
|
||||
message.any_value.Unpack(packed_message)
|
||||
self.assertEqual('string', packed_message.data)
|
||||
message.Clear()
|
||||
text_format.Parse(text, message, descriptor_pool=descriptor_pool.Default())
|
||||
text_format.Parse(text, message)
|
||||
packed_message = unittest_pb2.OneString()
|
||||
message.any_value.Unpack(packed_message)
|
||||
self.assertEqual('string', packed_message.data)
|
||||
@@ -1137,7 +1174,7 @@ class Proto3Tests(unittest.TestCase):
|
||||
' data: "string1"\n'
|
||||
' }\n'
|
||||
'}\n')
|
||||
text_format.Merge(text, message, descriptor_pool=descriptor_pool.Default())
|
||||
text_format.Merge(text, message)
|
||||
packed_message = unittest_pb2.OneString()
|
||||
message.repeated_any_value[0].Unpack(packed_message)
|
||||
self.assertEqual('string0', packed_message.data)
|
||||
@@ -1151,22 +1188,22 @@ class Proto3Tests(unittest.TestCase):
|
||||
' data: "string"\n'
|
||||
' >\n'
|
||||
'}\n')
|
||||
text_format.Merge(text, message, descriptor_pool=descriptor_pool.Default())
|
||||
text_format.Merge(text, message)
|
||||
packed_message = unittest_pb2.OneString()
|
||||
message.any_value.Unpack(packed_message)
|
||||
self.assertEqual('string', packed_message.data)
|
||||
|
||||
def testMergeExpandedAnyNoDescriptorPool(self):
|
||||
def testMergeAlternativeUrl(self):
|
||||
message = any_test_pb2.TestAny()
|
||||
text = ('any_value {\n'
|
||||
' [type.googleapis.com/protobuf_unittest.OneString] {\n'
|
||||
' [type.otherapi.com/protobuf_unittest.OneString] {\n'
|
||||
' data: "string"\n'
|
||||
' }\n'
|
||||
'}\n')
|
||||
with self.assertRaises(text_format.ParseError) as e:
|
||||
text_format.Merge(text, message, descriptor_pool=None)
|
||||
self.assertEqual(str(e.exception),
|
||||
'Descriptor pool required to parse expanded Any field')
|
||||
text_format.Merge(text, message)
|
||||
packed_message = unittest_pb2.OneString()
|
||||
self.assertEqual('type.otherapi.com/protobuf_unittest.OneString',
|
||||
message.any_value.type_url)
|
||||
|
||||
def testMergeExpandedAnyDescriptorPoolMissingType(self):
|
||||
message = any_test_pb2.TestAny()
|
||||
@@ -1193,6 +1230,15 @@ class Proto3Tests(unittest.TestCase):
|
||||
message.any_value.Unpack(packed_message)
|
||||
self.assertEqual('string', packed_message.data)
|
||||
|
||||
def testMergeMissingAnyEndToken(self):
|
||||
message = any_test_pb2.TestAny()
|
||||
text = ('any_value {\n'
|
||||
' [type.googleapis.com/protobuf_unittest.OneString] {\n'
|
||||
' data: "string"\n')
|
||||
with self.assertRaises(text_format.ParseError) as e:
|
||||
text_format.Merge(text, message)
|
||||
self.assertEqual(str(e.exception), '3:11 : Expected "}".')
|
||||
|
||||
|
||||
class TokenizerTest(unittest.TestCase):
|
||||
|
||||
@@ -1204,7 +1250,7 @@ class TokenizerTest(unittest.TestCase):
|
||||
'ID9: 22 ID10: -111111111111111111 ID11: -22\n'
|
||||
'ID12: 2222222222222222222 ID13: 1.23456f ID14: 1.2e+2f '
|
||||
'false_bool: 0 true_BOOL:t \n true_bool1: 1 false_BOOL1:f '
|
||||
'False_bool: False True_bool: True')
|
||||
'False_bool: False True_bool: True X:iNf Y:-inF Z:nAN')
|
||||
tokenizer = text_format.Tokenizer(text.splitlines())
|
||||
methods = [(tokenizer.ConsumeIdentifier, 'identifier1'), ':',
|
||||
(tokenizer.ConsumeString, 'string1'),
|
||||
@@ -1252,7 +1298,13 @@ class TokenizerTest(unittest.TestCase):
|
||||
(tokenizer.ConsumeIdentifier, 'False_bool'), ':',
|
||||
(tokenizer.ConsumeBool, False),
|
||||
(tokenizer.ConsumeIdentifier, 'True_bool'), ':',
|
||||
(tokenizer.ConsumeBool, True)]
|
||||
(tokenizer.ConsumeBool, True),
|
||||
(tokenizer.ConsumeIdentifier, 'X'), ':',
|
||||
(tokenizer.ConsumeFloat, float('inf')),
|
||||
(tokenizer.ConsumeIdentifier, 'Y'), ':',
|
||||
(tokenizer.ConsumeFloat, float('-inf')),
|
||||
(tokenizer.ConsumeIdentifier, 'Z'), ':',
|
||||
(tokenizer.ConsumeFloat, float('nan'))]
|
||||
|
||||
i = 0
|
||||
while not tokenizer.AtEnd():
|
||||
@@ -1261,6 +1313,8 @@ class TokenizerTest(unittest.TestCase):
|
||||
token = tokenizer.token
|
||||
self.assertEqual(token, m)
|
||||
tokenizer.NextToken()
|
||||
elif isinstance(m[1], float) and math.isnan(m[1]):
|
||||
self.assertTrue(math.isnan(m[0]()))
|
||||
else:
|
||||
self.assertEqual(m[1], m[0]())
|
||||
i += 1
|
||||
@@ -1279,10 +1333,15 @@ class TokenizerTest(unittest.TestCase):
|
||||
self.assertEqual(int64_max + 1, tokenizer.ConsumeInteger())
|
||||
self.assertTrue(tokenizer.AtEnd())
|
||||
|
||||
text = '-0 0'
|
||||
text = '-0 0 0 1.2'
|
||||
tokenizer = text_format.Tokenizer(text.splitlines())
|
||||
self.assertEqual(0, tokenizer.ConsumeInteger())
|
||||
self.assertEqual(0, tokenizer.ConsumeInteger())
|
||||
self.assertEqual(True, tokenizer.TryConsumeInteger())
|
||||
self.assertEqual(False, tokenizer.TryConsumeInteger())
|
||||
with self.assertRaises(text_format.ParseError):
|
||||
tokenizer.ConsumeInteger()
|
||||
self.assertEqual(1.2, tokenizer.ConsumeFloat())
|
||||
self.assertTrue(tokenizer.AtEnd())
|
||||
|
||||
def testConsumeIntegers(self):
|
||||
@@ -1425,5 +1484,101 @@ class TokenizerTest(unittest.TestCase):
|
||||
tokenizer.ConsumeCommentOrTrailingComment())
|
||||
self.assertTrue(tokenizer.AtEnd())
|
||||
|
||||
|
||||
# Tests for pretty printer functionality.
|
||||
@_parameterized.Parameters((unittest_pb2), (unittest_proto3_arena_pb2))
|
||||
class PrettyPrinterTest(TextFormatBase):
|
||||
|
||||
def testPrettyPrintNoMatch(self, message_module):
|
||||
|
||||
def printer(message, indent, as_one_line):
|
||||
del message, indent, as_one_line
|
||||
return None
|
||||
|
||||
message = message_module.TestAllTypes()
|
||||
msg = message.repeated_nested_message.add()
|
||||
msg.bb = 42
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=True, message_formatter=printer),
|
||||
'repeated_nested_message { bb: 42 }')
|
||||
|
||||
def testPrettyPrintOneLine(self, message_module):
|
||||
|
||||
def printer(m, indent, as_one_line):
|
||||
del indent, as_one_line
|
||||
if m.DESCRIPTOR == message_module.TestAllTypes.NestedMessage.DESCRIPTOR:
|
||||
return 'My lucky number is %s' % m.bb
|
||||
|
||||
message = message_module.TestAllTypes()
|
||||
msg = message.repeated_nested_message.add()
|
||||
msg.bb = 42
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=True, message_formatter=printer),
|
||||
'repeated_nested_message { My lucky number is 42 }')
|
||||
|
||||
def testPrettyPrintMultiLine(self, message_module):
|
||||
|
||||
def printer(m, indent, as_one_line):
|
||||
if m.DESCRIPTOR == message_module.TestAllTypes.NestedMessage.DESCRIPTOR:
|
||||
line_deliminator = (' ' if as_one_line else '\n') + ' ' * indent
|
||||
return 'My lucky number is:%s%s' % (line_deliminator, m.bb)
|
||||
return None
|
||||
|
||||
message = message_module.TestAllTypes()
|
||||
msg = message.repeated_nested_message.add()
|
||||
msg.bb = 42
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=True, message_formatter=printer),
|
||||
'repeated_nested_message { My lucky number is: 42 }')
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=False, message_formatter=printer),
|
||||
'repeated_nested_message {\n My lucky number is:\n 42\n}\n')
|
||||
|
||||
def testPrettyPrintEntireMessage(self, message_module):
|
||||
|
||||
def printer(m, indent, as_one_line):
|
||||
del indent, as_one_line
|
||||
if m.DESCRIPTOR == message_module.TestAllTypes.DESCRIPTOR:
|
||||
return 'The is the message!'
|
||||
return None
|
||||
|
||||
message = message_module.TestAllTypes()
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=False, message_formatter=printer),
|
||||
'The is the message!\n')
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=True, message_formatter=printer),
|
||||
'The is the message!')
|
||||
|
||||
def testPrettyPrintMultipleParts(self, message_module):
|
||||
|
||||
def printer(m, indent, as_one_line):
|
||||
del indent, as_one_line
|
||||
if m.DESCRIPTOR == message_module.TestAllTypes.NestedMessage.DESCRIPTOR:
|
||||
return 'My lucky number is %s' % m.bb
|
||||
return None
|
||||
|
||||
message = message_module.TestAllTypes()
|
||||
message.optional_int32 = 61
|
||||
msg = message.repeated_nested_message.add()
|
||||
msg.bb = 42
|
||||
msg = message.repeated_nested_message.add()
|
||||
msg.bb = 99
|
||||
msg = message.optional_nested_message
|
||||
msg.bb = 1
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(
|
||||
message, as_one_line=True, message_formatter=printer),
|
||||
('optional_int32: 61 '
|
||||
'optional_nested_message { My lucky number is 1 } '
|
||||
'repeated_nested_message { My lucky number is 42 } '
|
||||
'repeated_nested_message { My lucky number is 99 }'))
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -54,10 +54,13 @@ from google.protobuf.internal import type_checkers
|
||||
BaseTestCase = testing_refleaks.BaseTestCase
|
||||
|
||||
|
||||
def SkipIfCppImplementation(func):
|
||||
# CheckUnknownField() cannot be used by the C++ implementation because
|
||||
# some protect members are called. It is not a behavior difference
|
||||
# for python and C++ implementation.
|
||||
def SkipCheckUnknownFieldIfCppImplementation(func):
|
||||
return unittest.skipIf(
|
||||
api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
|
||||
'C++ implementation does not expose unknown fields to Python')(func)
|
||||
'Addtional test for pure python involved protect members')(func)
|
||||
|
||||
|
||||
class UnknownFieldsTest(BaseTestCase):
|
||||
@@ -77,11 +80,23 @@ class UnknownFieldsTest(BaseTestCase):
|
||||
# stdout.
|
||||
self.assertTrue(data == self.all_fields_data)
|
||||
|
||||
def testSerializeProto3(self):
|
||||
# Verify that proto3 doesn't preserve unknown fields.
|
||||
def expectSerializeProto3(self, preserve):
|
||||
message = unittest_proto3_arena_pb2.TestEmptyMessage()
|
||||
message.ParseFromString(self.all_fields_data)
|
||||
self.assertEqual(0, len(message.SerializeToString()))
|
||||
if preserve:
|
||||
self.assertEqual(self.all_fields_data, message.SerializeToString())
|
||||
else:
|
||||
self.assertEqual(0, len(message.SerializeToString()))
|
||||
|
||||
def testSerializeProto3(self):
|
||||
# Verify that proto3 unknown fields behavior.
|
||||
default_preserve = (api_implementation
|
||||
.GetPythonProto3PreserveUnknownsDefault())
|
||||
self.expectSerializeProto3(default_preserve)
|
||||
api_implementation.SetPythonProto3PreserveUnknownsDefault(
|
||||
not default_preserve)
|
||||
self.expectSerializeProto3(not default_preserve)
|
||||
api_implementation.SetPythonProto3PreserveUnknownsDefault(default_preserve)
|
||||
|
||||
def testByteSize(self):
|
||||
self.assertEqual(self.all_fields.ByteSize(), self.empty_message.ByteSize())
|
||||
@@ -154,12 +169,13 @@ class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
self.empty_message = unittest_pb2.TestEmptyMessage()
|
||||
self.empty_message.ParseFromString(self.all_fields_data)
|
||||
|
||||
# GetUnknownField() checks a detail of the Python implementation, which stores
|
||||
# unknown fields as serialized strings. It cannot be used by the C++
|
||||
# implementation: it's enough to check that the message is correctly
|
||||
# serialized.
|
||||
# CheckUnknownField() is an additional Pure Python check which checks
|
||||
# a detail of unknown fields. It cannot be used by the C++
|
||||
# implementation because some protect members are called.
|
||||
# The test is added for historical reasons. It is not necessary as
|
||||
# serialized string is checked.
|
||||
|
||||
def GetUnknownField(self, name):
|
||||
def CheckUnknownField(self, name, expected_value):
|
||||
field_descriptor = self.descriptor.fields_by_name[name]
|
||||
wire_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[field_descriptor.type]
|
||||
field_tag = encoder.TagBytes(field_descriptor.number, wire_type)
|
||||
@@ -168,42 +184,35 @@ class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
if tag_bytes == field_tag:
|
||||
decoder = unittest_pb2.TestAllTypes._decoders_by_tag[tag_bytes][0]
|
||||
decoder(value, 0, len(value), self.all_fields, result_dict)
|
||||
return result_dict[field_descriptor]
|
||||
self.assertEqual(expected_value, result_dict[field_descriptor])
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testEnum(self):
|
||||
value = self.GetUnknownField('optional_nested_enum')
|
||||
self.assertEqual(self.all_fields.optional_nested_enum, value)
|
||||
@SkipCheckUnknownFieldIfCppImplementation
|
||||
def testCheckUnknownFieldValue(self):
|
||||
# Test enum.
|
||||
self.CheckUnknownField('optional_nested_enum',
|
||||
self.all_fields.optional_nested_enum)
|
||||
# Test repeated enum.
|
||||
self.CheckUnknownField('repeated_nested_enum',
|
||||
self.all_fields.repeated_nested_enum)
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testRepeatedEnum(self):
|
||||
value = self.GetUnknownField('repeated_nested_enum')
|
||||
self.assertEqual(self.all_fields.repeated_nested_enum, value)
|
||||
# Test varint.
|
||||
self.CheckUnknownField('optional_int32',
|
||||
self.all_fields.optional_int32)
|
||||
# Test fixed32.
|
||||
self.CheckUnknownField('optional_fixed32',
|
||||
self.all_fields.optional_fixed32)
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testVarint(self):
|
||||
value = self.GetUnknownField('optional_int32')
|
||||
self.assertEqual(self.all_fields.optional_int32, value)
|
||||
# Test fixed64.
|
||||
self.CheckUnknownField('optional_fixed64',
|
||||
self.all_fields.optional_fixed64)
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testFixed32(self):
|
||||
value = self.GetUnknownField('optional_fixed32')
|
||||
self.assertEqual(self.all_fields.optional_fixed32, value)
|
||||
# Test lengthd elimited.
|
||||
self.CheckUnknownField('optional_string',
|
||||
self.all_fields.optional_string)
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testFixed64(self):
|
||||
value = self.GetUnknownField('optional_fixed64')
|
||||
self.assertEqual(self.all_fields.optional_fixed64, value)
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testLengthDelimited(self):
|
||||
value = self.GetUnknownField('optional_string')
|
||||
self.assertEqual(self.all_fields.optional_string, value)
|
||||
|
||||
@SkipIfCppImplementation
|
||||
def testGroup(self):
|
||||
value = self.GetUnknownField('optionalgroup')
|
||||
self.assertEqual(self.all_fields.optionalgroup, value)
|
||||
# Test group.
|
||||
self.CheckUnknownField('optionalgroup',
|
||||
self.all_fields.optionalgroup)
|
||||
|
||||
def testCopyFrom(self):
|
||||
message = unittest_pb2.TestEmptyMessage()
|
||||
@@ -263,12 +272,13 @@ class UnknownEnumValuesTest(BaseTestCase):
|
||||
self.missing_message = missing_enum_values_pb2.TestMissingEnumValues()
|
||||
self.missing_message.ParseFromString(self.message_data)
|
||||
|
||||
# GetUnknownField() checks a detail of the Python implementation, which stores
|
||||
# unknown fields as serialized strings. It cannot be used by the C++
|
||||
# implementation: it's enough to check that the message is correctly
|
||||
# serialized.
|
||||
# CheckUnknownField() is an additional Pure Python check which checks
|
||||
# a detail of unknown fields. It cannot be used by the C++
|
||||
# implementation because some protect members are called.
|
||||
# The test is added for historical reasons. It is not necessary as
|
||||
# serialized string is checked.
|
||||
|
||||
def GetUnknownField(self, name):
|
||||
def CheckUnknownField(self, name, expected_value):
|
||||
field_descriptor = self.descriptor.fields_by_name[name]
|
||||
wire_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[field_descriptor.type]
|
||||
field_tag = encoder.TagBytes(field_descriptor.number, wire_type)
|
||||
@@ -278,7 +288,7 @@ class UnknownEnumValuesTest(BaseTestCase):
|
||||
decoder = missing_enum_values_pb2.TestEnumValues._decoders_by_tag[
|
||||
tag_bytes][0]
|
||||
decoder(value, 0, len(value), self.message, result_dict)
|
||||
return result_dict[field_descriptor]
|
||||
self.assertEqual(expected_value, result_dict[field_descriptor])
|
||||
|
||||
def testUnknownParseMismatchEnumValue(self):
|
||||
just_string = missing_enum_values_pb2.JustString()
|
||||
@@ -294,38 +304,27 @@ class UnknownEnumValuesTest(BaseTestCase):
|
||||
self.assertEqual(missing.optional_nested_enum, 0)
|
||||
|
||||
def testUnknownEnumValue(self):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# The CPP implementation of protos (wrongly) allows unknown enum values
|
||||
# for proto2.
|
||||
self.assertTrue(self.missing_message.HasField('optional_nested_enum'))
|
||||
self.assertEqual(self.message.optional_nested_enum,
|
||||
self.missing_message.optional_nested_enum)
|
||||
else:
|
||||
# On the other hand, the Python implementation considers unknown values
|
||||
# as unknown fields. This is the correct behavior.
|
||||
self.assertFalse(self.missing_message.HasField('optional_nested_enum'))
|
||||
value = self.GetUnknownField('optional_nested_enum')
|
||||
self.assertEqual(self.message.optional_nested_enum, value)
|
||||
self.missing_message.ClearField('optional_nested_enum')
|
||||
self.assertFalse(self.missing_message.HasField('optional_nested_enum'))
|
||||
self.assertEqual(self.missing_message.optional_nested_enum, 2)
|
||||
# Clear does not do anything.
|
||||
serialized = self.missing_message.SerializeToString()
|
||||
self.missing_message.ClearField('optional_nested_enum')
|
||||
self.assertEqual(self.missing_message.SerializeToString(), serialized)
|
||||
|
||||
def testUnknownRepeatedEnumValue(self):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# For repeated enums, both implementations agree.
|
||||
self.assertEqual([], self.missing_message.repeated_nested_enum)
|
||||
else:
|
||||
self.assertEqual([], self.missing_message.repeated_nested_enum)
|
||||
value = self.GetUnknownField('repeated_nested_enum')
|
||||
self.assertEqual(self.message.repeated_nested_enum, value)
|
||||
self.assertEqual([], self.missing_message.repeated_nested_enum)
|
||||
|
||||
def testUnknownPackedEnumValue(self):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# For repeated enums, both implementations agree.
|
||||
self.assertEqual([], self.missing_message.packed_nested_enum)
|
||||
else:
|
||||
self.assertEqual([], self.missing_message.packed_nested_enum)
|
||||
value = self.GetUnknownField('packed_nested_enum')
|
||||
self.assertEqual(self.message.packed_nested_enum, value)
|
||||
self.assertEqual([], self.missing_message.packed_nested_enum)
|
||||
|
||||
@SkipCheckUnknownFieldIfCppImplementation
|
||||
def testCheckUnknownFieldValueForEnum(self):
|
||||
self.CheckUnknownField('optional_nested_enum',
|
||||
self.message.optional_nested_enum)
|
||||
self.CheckUnknownField('repeated_nested_enum',
|
||||
self.message.repeated_nested_enum)
|
||||
self.CheckUnknownField('packed_nested_enum',
|
||||
self.message.packed_nested_enum)
|
||||
|
||||
def testRoundTrip(self):
|
||||
new_message = missing_enum_values_pb2.TestEnumValues()
|
||||
|
||||
@@ -40,6 +40,7 @@ This files defines well known classes which need extra maintenance including:
|
||||
|
||||
__author__ = 'jieluo@google.com (Jie Luo)'
|
||||
|
||||
import collections
|
||||
from datetime import datetime
|
||||
from datetime import timedelta
|
||||
import six
|
||||
@@ -67,13 +68,14 @@ class ParseError(Error):
|
||||
class Any(object):
|
||||
"""Class for Any Message type."""
|
||||
|
||||
def Pack(self, msg, type_url_prefix='type.googleapis.com/'):
|
||||
def Pack(self, msg, type_url_prefix='type.googleapis.com/',
|
||||
deterministic=None):
|
||||
"""Packs the specified message into current Any message."""
|
||||
if len(type_url_prefix) < 1 or type_url_prefix[-1] != '/':
|
||||
self.type_url = '%s/%s' % (type_url_prefix, msg.DESCRIPTOR.full_name)
|
||||
else:
|
||||
self.type_url = '%s%s' % (type_url_prefix, msg.DESCRIPTOR.full_name)
|
||||
self.value = msg.SerializeToString()
|
||||
self.value = msg.SerializeToString(deterministic=deterministic)
|
||||
|
||||
def Unpack(self, msg):
|
||||
"""Unpacks the current Any message into specified message."""
|
||||
@@ -350,12 +352,12 @@ class Duration(object):
|
||||
self.nanos, _NANOS_PER_MICROSECOND))
|
||||
|
||||
def FromTimedelta(self, td):
|
||||
"""Convertd timedelta to Duration."""
|
||||
"""Converts timedelta to Duration."""
|
||||
self._NormalizeDuration(td.seconds + td.days * _SECONDS_PER_DAY,
|
||||
td.microseconds * _NANOS_PER_MICROSECOND)
|
||||
|
||||
def _NormalizeDuration(self, seconds, nanos):
|
||||
"""Set Duration by seconds and nonas."""
|
||||
"""Set Duration by seconds and nanos."""
|
||||
# Force nanos to be negative if the duration is negative.
|
||||
if seconds < 0 and nanos > 0:
|
||||
seconds += 1
|
||||
@@ -473,7 +475,7 @@ def _IsValidPath(message_descriptor, path):
|
||||
parts = path.split('.')
|
||||
last = parts.pop()
|
||||
for name in parts:
|
||||
field = message_descriptor.fields_by_name[name]
|
||||
field = message_descriptor.fields_by_name.get(name)
|
||||
if (field is None or
|
||||
field.label == FieldDescriptor.LABEL_REPEATED or
|
||||
field.type != FieldDescriptor.TYPE_MESSAGE):
|
||||
@@ -698,6 +700,12 @@ def _SetStructValue(struct_value, value):
|
||||
struct_value.string_value = value
|
||||
elif isinstance(value, _INT_OR_FLOAT):
|
||||
struct_value.number_value = value
|
||||
elif isinstance(value, dict):
|
||||
struct_value.struct_value.Clear()
|
||||
struct_value.struct_value.update(value)
|
||||
elif isinstance(value, list):
|
||||
struct_value.list_value.Clear()
|
||||
struct_value.list_value.extend(value)
|
||||
else:
|
||||
raise ValueError('Unexpected type')
|
||||
|
||||
@@ -728,18 +736,49 @@ class Struct(object):
|
||||
def __getitem__(self, key):
|
||||
return _GetStructValue(self.fields[key])
|
||||
|
||||
def __contains__(self, item):
|
||||
return item in self.fields
|
||||
|
||||
def __setitem__(self, key, value):
|
||||
_SetStructValue(self.fields[key], value)
|
||||
|
||||
def __delitem__(self, key):
|
||||
del self.fields[key]
|
||||
|
||||
def __len__(self):
|
||||
return len(self.fields)
|
||||
|
||||
def __iter__(self):
|
||||
return iter(self.fields)
|
||||
|
||||
def keys(self): # pylint: disable=invalid-name
|
||||
return self.fields.keys()
|
||||
|
||||
def values(self): # pylint: disable=invalid-name
|
||||
return [self[key] for key in self]
|
||||
|
||||
def items(self): # pylint: disable=invalid-name
|
||||
return [(key, self[key]) for key in self]
|
||||
|
||||
def get_or_create_list(self, key):
|
||||
"""Returns a list for this key, creating if it didn't exist already."""
|
||||
if not self.fields[key].HasField('list_value'):
|
||||
# Clear will mark list_value modified which will indeed create a list.
|
||||
self.fields[key].list_value.Clear()
|
||||
return self.fields[key].list_value
|
||||
|
||||
def get_or_create_struct(self, key):
|
||||
"""Returns a struct for this key, creating if it didn't exist already."""
|
||||
if not self.fields[key].HasField('struct_value'):
|
||||
# Clear will mark struct_value modified which will indeed create a struct.
|
||||
self.fields[key].struct_value.Clear()
|
||||
return self.fields[key].struct_value
|
||||
|
||||
# TODO(haberman): allow constructing/merging from dict.
|
||||
def update(self, dictionary): # pylint: disable=invalid-name
|
||||
for key, value in dictionary.items():
|
||||
_SetStructValue(self.fields[key], value)
|
||||
|
||||
collections.MutableMapping.register(Struct)
|
||||
|
||||
|
||||
class ListValue(object):
|
||||
@@ -762,17 +801,28 @@ class ListValue(object):
|
||||
def __setitem__(self, index, value):
|
||||
_SetStructValue(self.values.__getitem__(index), value)
|
||||
|
||||
def __delitem__(self, key):
|
||||
del self.values[key]
|
||||
|
||||
def items(self):
|
||||
for i in range(len(self)):
|
||||
yield self[i]
|
||||
|
||||
def add_struct(self):
|
||||
"""Appends and returns a struct value as the next value in the list."""
|
||||
return self.values.add().struct_value
|
||||
struct_value = self.values.add().struct_value
|
||||
# Clear will mark struct_value modified which will indeed create a struct.
|
||||
struct_value.Clear()
|
||||
return struct_value
|
||||
|
||||
def add_list(self):
|
||||
"""Appends and returns a list value as the next value in the list."""
|
||||
return self.values.add().list_value
|
||||
list_value = self.values.add().list_value
|
||||
# Clear will mark list_value modified which will indeed create a list.
|
||||
list_value.Clear()
|
||||
return list_value
|
||||
|
||||
collections.MutableSequence.register(ListValue)
|
||||
|
||||
|
||||
WKTBASES = {
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
__author__ = 'jieluo@google.com (Jie Luo)'
|
||||
|
||||
import collections
|
||||
from datetime import datetime
|
||||
|
||||
try:
|
||||
@@ -105,6 +106,10 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
self.assertEqual(8 * 3600, message.seconds)
|
||||
self.assertEqual(0, message.nanos)
|
||||
|
||||
# It is not easy to check with current time. For test coverage only.
|
||||
message.GetCurrentTime()
|
||||
self.assertNotEqual(8 * 3600, message.seconds)
|
||||
|
||||
def testDurationSerializeAndParse(self):
|
||||
message = duration_pb2.Duration()
|
||||
# Generated output should contain 3, 6, or 9 fractional digits.
|
||||
@@ -267,6 +272,17 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
|
||||
def testInvalidTimestamp(self):
|
||||
message = timestamp_pb2.Timestamp()
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
'Failed to parse timestamp: missing valid timezone offset.',
|
||||
message.FromJsonString,
|
||||
'')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
'Failed to parse timestamp: invalid trailing data '
|
||||
'1970-01-01T00:00:01Ztrail.',
|
||||
message.FromJsonString,
|
||||
'1970-01-01T00:00:01Ztrail')
|
||||
self.assertRaisesRegexp(
|
||||
ValueError,
|
||||
'time data \'10000-01-01T00:00:00\' does not match'
|
||||
@@ -284,7 +300,7 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
'1972-01-01T01:00:00.01+08',)
|
||||
self.assertRaisesRegexp(
|
||||
ValueError,
|
||||
'year is out of range',
|
||||
'year (0 )?is out of range',
|
||||
message.FromJsonString,
|
||||
'0000-01-01T00:00:00Z')
|
||||
message.seconds = 253402300800
|
||||
@@ -322,6 +338,13 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
r'Duration is not valid\: Seconds -315576000001 must be in range'
|
||||
r' \[-315576000000\, 315576000000\].',
|
||||
message.ToJsonString)
|
||||
message.seconds = 0
|
||||
message.nanos = 999999999 + 1
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
r'Duration is not valid\: Nanos 1000000000 must be in range'
|
||||
r' \[-999999999\, 999999999\].',
|
||||
message.ToJsonString)
|
||||
|
||||
|
||||
class FieldMaskTest(unittest.TestCase):
|
||||
@@ -363,10 +386,37 @@ class FieldMaskTest(unittest.TestCase):
|
||||
self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
|
||||
for field in msg_descriptor.fields:
|
||||
self.assertTrue(field.name in mask.paths)
|
||||
|
||||
def testIsValidForDescriptor(self):
|
||||
msg_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
# Empty mask
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# All fields from descriptor
|
||||
mask.AllFieldsFromDescriptor(msg_descriptor)
|
||||
self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# Child under optional message
|
||||
mask.paths.append('optional_nested_message.bb')
|
||||
self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# Repeated field is only allowed in the last position of path
|
||||
mask.paths.append('repeated_nested_message.bb')
|
||||
self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# Invalid top level field
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
mask.paths.append('xxx')
|
||||
self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# Invalid field in root
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
mask.paths.append('xxx.zzz')
|
||||
self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# Invalid field in internal node
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
mask.paths.append('optional_nested_message.xxx.zzz')
|
||||
self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
|
||||
# Invalid field in leaf
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
mask.paths.append('optional_nested_message.xxx')
|
||||
self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
|
||||
|
||||
def testCanonicalFrom(self):
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
@@ -422,6 +472,9 @@ class FieldMaskTest(unittest.TestCase):
|
||||
mask2.FromJsonString('foo.bar,bar')
|
||||
out_mask.Union(mask1, mask2)
|
||||
self.assertEqual('bar,foo.bar,quz', out_mask.ToJsonString())
|
||||
src = unittest_pb2.TestAllTypes()
|
||||
with self.assertRaises(ValueError):
|
||||
out_mask.Union(src, mask2)
|
||||
|
||||
def testIntersect(self):
|
||||
mask1 = field_mask_pb2.FieldMask()
|
||||
@@ -546,6 +599,19 @@ class FieldMaskTest(unittest.TestCase):
|
||||
self.assertEqual(1, len(nested_dst.payload.repeated_int32))
|
||||
self.assertEqual(1234, nested_dst.payload.repeated_int32[0])
|
||||
|
||||
def testMergeErrors(self):
|
||||
src = unittest_pb2.TestAllTypes()
|
||||
dst = unittest_pb2.TestAllTypes()
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
test_util.SetAllFields(src)
|
||||
mask.FromJsonString('optionalInt32.field')
|
||||
with self.assertRaises(ValueError) as e:
|
||||
mask.MergeMessage(src, dst)
|
||||
self.assertEqual('Error: Field optional_int32 in message '
|
||||
'protobuf_unittest.TestAllTypes is not a singular '
|
||||
'message field and cannot have sub-fields.',
|
||||
str(e.exception))
|
||||
|
||||
def testSnakeCaseToCamelCase(self):
|
||||
self.assertEqual('fooBar',
|
||||
well_known_types._SnakeCaseToCamelCase('foo_bar'))
|
||||
@@ -602,6 +668,8 @@ class StructTest(unittest.TestCase):
|
||||
|
||||
def testStruct(self):
|
||||
struct = struct_pb2.Struct()
|
||||
self.assertIsInstance(struct, collections.Mapping)
|
||||
self.assertEqual(0, len(struct))
|
||||
struct_class = struct.__class__
|
||||
|
||||
struct['key1'] = 5
|
||||
@@ -609,9 +677,13 @@ class StructTest(unittest.TestCase):
|
||||
struct['key3'] = True
|
||||
struct.get_or_create_struct('key4')['subkey'] = 11.0
|
||||
struct_list = struct.get_or_create_list('key5')
|
||||
self.assertIsInstance(struct_list, collections.Sequence)
|
||||
struct_list.extend([6, 'seven', True, False, None])
|
||||
struct_list.add_struct()['subkey2'] = 9
|
||||
struct['key6'] = {'subkey': {}}
|
||||
struct['key7'] = [2, False]
|
||||
|
||||
self.assertEqual(7, len(struct))
|
||||
self.assertTrue(isinstance(struct, well_known_types.Struct))
|
||||
self.assertEqual(5, struct['key1'])
|
||||
self.assertEqual('abc', struct['key2'])
|
||||
@@ -621,13 +693,28 @@ class StructTest(unittest.TestCase):
|
||||
inner_struct['subkey2'] = 9
|
||||
self.assertEqual([6, 'seven', True, False, None, inner_struct],
|
||||
list(struct['key5'].items()))
|
||||
self.assertEqual({}, dict(struct['key6']['subkey'].fields))
|
||||
self.assertEqual([2, False], list(struct['key7'].items()))
|
||||
|
||||
serialized = struct.SerializeToString()
|
||||
|
||||
struct2 = struct_pb2.Struct()
|
||||
struct2.ParseFromString(serialized)
|
||||
|
||||
self.assertEqual(struct, struct2)
|
||||
for key, value in struct.items():
|
||||
self.assertIn(key, struct)
|
||||
self.assertIn(key, struct2)
|
||||
self.assertEqual(value, struct2[key])
|
||||
|
||||
self.assertEqual(7, len(struct.keys()))
|
||||
self.assertEqual(7, len(struct.values()))
|
||||
for key in struct.keys():
|
||||
self.assertIn(key, struct)
|
||||
self.assertIn(key, struct2)
|
||||
self.assertEqual(struct[key], struct2[key])
|
||||
|
||||
item = (next(iter(struct.keys())), next(iter(struct.values())))
|
||||
self.assertEqual(item, next(iter(struct.items())))
|
||||
|
||||
self.assertTrue(isinstance(struct2, well_known_types.Struct))
|
||||
self.assertEqual(5, struct2['key1'])
|
||||
@@ -651,6 +738,17 @@ class StructTest(unittest.TestCase):
|
||||
struct_list.add_list().extend([1, 'two', True, False, None])
|
||||
self.assertEqual([1, 'two', True, False, None],
|
||||
list(struct_list[6].items()))
|
||||
struct_list.extend([{'nested_struct': 30}, ['nested_list', 99], {}, []])
|
||||
self.assertEqual(11, len(struct_list.values))
|
||||
self.assertEqual(30, struct_list[7]['nested_struct'])
|
||||
self.assertEqual('nested_list', struct_list[8][0])
|
||||
self.assertEqual(99, struct_list[8][1])
|
||||
self.assertEqual({}, dict(struct_list[9].fields))
|
||||
self.assertEqual([], list(struct_list[10].items()))
|
||||
struct_list[0] = {'replace': 'set'}
|
||||
struct_list[1] = ['replace', 'set']
|
||||
self.assertEqual('set', struct_list[0]['replace'])
|
||||
self.assertEqual(['replace', 'set'], list(struct_list[1].items()))
|
||||
|
||||
text_serialized = str(struct)
|
||||
struct3 = struct_pb2.Struct()
|
||||
@@ -660,6 +758,77 @@ class StructTest(unittest.TestCase):
|
||||
struct.get_or_create_struct('key3')['replace'] = 12
|
||||
self.assertEqual(12, struct['key3']['replace'])
|
||||
|
||||
# Tests empty list.
|
||||
struct.get_or_create_list('empty_list')
|
||||
empty_list = struct['empty_list']
|
||||
self.assertEqual([], list(empty_list.items()))
|
||||
list2 = struct_pb2.ListValue()
|
||||
list2.add_list()
|
||||
empty_list = list2[0]
|
||||
self.assertEqual([], list(empty_list.items()))
|
||||
|
||||
# Tests empty struct.
|
||||
struct.get_or_create_struct('empty_struct')
|
||||
empty_struct = struct['empty_struct']
|
||||
self.assertEqual({}, dict(empty_struct.fields))
|
||||
list2.add_struct()
|
||||
empty_struct = list2[1]
|
||||
self.assertEqual({}, dict(empty_struct.fields))
|
||||
|
||||
self.assertEqual(9, len(struct))
|
||||
del struct['key3']
|
||||
del struct['key4']
|
||||
self.assertEqual(7, len(struct))
|
||||
self.assertEqual(6, len(struct['key5']))
|
||||
del struct['key5'][1]
|
||||
self.assertEqual(5, len(struct['key5']))
|
||||
self.assertEqual([6, True, False, None, inner_struct],
|
||||
list(struct['key5'].items()))
|
||||
|
||||
def testMergeFrom(self):
|
||||
struct = struct_pb2.Struct()
|
||||
struct_class = struct.__class__
|
||||
|
||||
dictionary = {
|
||||
'key1': 5,
|
||||
'key2': 'abc',
|
||||
'key3': True,
|
||||
'key4': {'subkey': 11.0},
|
||||
'key5': [6, 'seven', True, False, None, {'subkey2': 9}],
|
||||
'key6': [['nested_list', True]],
|
||||
'empty_struct': {},
|
||||
'empty_list': []
|
||||
}
|
||||
struct.update(dictionary)
|
||||
self.assertEqual(5, struct['key1'])
|
||||
self.assertEqual('abc', struct['key2'])
|
||||
self.assertIs(True, struct['key3'])
|
||||
self.assertEqual(11, struct['key4']['subkey'])
|
||||
inner_struct = struct_class()
|
||||
inner_struct['subkey2'] = 9
|
||||
self.assertEqual([6, 'seven', True, False, None, inner_struct],
|
||||
list(struct['key5'].items()))
|
||||
self.assertEqual(2, len(struct['key6'][0].values))
|
||||
self.assertEqual('nested_list', struct['key6'][0][0])
|
||||
self.assertEqual(True, struct['key6'][0][1])
|
||||
empty_list = struct['empty_list']
|
||||
self.assertEqual([], list(empty_list.items()))
|
||||
empty_struct = struct['empty_struct']
|
||||
self.assertEqual({}, dict(empty_struct.fields))
|
||||
|
||||
# According to documentation: "When parsing from the wire or when merging,
|
||||
# if there are duplicate map keys the last key seen is used".
|
||||
duplicate = {
|
||||
'key4': {'replace': 20},
|
||||
'key5': [[False, 5]]
|
||||
}
|
||||
struct.update(duplicate)
|
||||
self.assertEqual(1, len(struct['key4'].fields))
|
||||
self.assertEqual(20, struct['key4']['replace'])
|
||||
self.assertEqual(1, len(struct['key5'].values))
|
||||
self.assertEqual(False, struct['key5'][0][0])
|
||||
self.assertEqual(5, struct['key5'][0][1])
|
||||
|
||||
|
||||
class AnyTest(unittest.TestCase):
|
||||
|
||||
@@ -723,6 +892,20 @@ class AnyTest(unittest.TestCase):
|
||||
self.assertTrue(msg.Unpack(unpacked_message))
|
||||
self.assertEqual(submessage, unpacked_message)
|
||||
|
||||
def testPackDeterministic(self):
|
||||
submessage = any_test_pb2.TestAny()
|
||||
for i in range(10):
|
||||
submessage.map_value[str(i)] = i * 2
|
||||
msg = any_pb2.Any()
|
||||
msg.Pack(submessage, deterministic=True)
|
||||
serialized = msg.SerializeToString(deterministic=True)
|
||||
golden = (b'\n4type.googleapis.com/google.protobuf.internal.TestAny\x12F'
|
||||
b'\x1a\x05\n\x010\x10\x00\x1a\x05\n\x011\x10\x02\x1a\x05\n\x01'
|
||||
b'2\x10\x04\x1a\x05\n\x013\x10\x06\x1a\x05\n\x014\x10\x08\x1a'
|
||||
b'\x05\n\x015\x10\n\x1a\x05\n\x016\x10\x0c\x1a\x05\n\x017\x10'
|
||||
b'\x0e\x1a\x05\n\x018\x10\x10\x1a\x05\n\x019\x10\x12')
|
||||
self.assertEqual(golden, serialized)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -74,6 +74,9 @@ _UNPAIRED_SURROGATE_PATTERN = re.compile(six.u(
|
||||
r'[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]'
|
||||
))
|
||||
|
||||
_VALID_EXTENSION_NAME = re.compile(r'\[[a-zA-Z0-9\._]*\]$')
|
||||
|
||||
|
||||
class Error(Exception):
|
||||
"""Top-level module error for json_format."""
|
||||
|
||||
@@ -88,7 +91,9 @@ class ParseError(Error):
|
||||
|
||||
def MessageToJson(message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False):
|
||||
preserving_proto_field_name=False,
|
||||
indent=2,
|
||||
sort_keys=False):
|
||||
"""Converts protobuf message to JSON format.
|
||||
|
||||
Args:
|
||||
@@ -100,19 +105,24 @@ def MessageToJson(message,
|
||||
preserving_proto_field_name: If True, use the original proto field
|
||||
names as defined in the .proto file. If False, convert the field
|
||||
names to lowerCamelCase.
|
||||
indent: The JSON object will be pretty-printed with this indent level.
|
||||
An indent level of 0 or negative will only insert newlines.
|
||||
sort_keys: If True, then the output will be sorted by field names.
|
||||
|
||||
Returns:
|
||||
A string containing the JSON formatted protocol buffer message.
|
||||
"""
|
||||
printer = _Printer(including_default_value_fields,
|
||||
preserving_proto_field_name)
|
||||
return printer.ToJsonString(message)
|
||||
return printer.ToJsonString(message, indent, sort_keys)
|
||||
|
||||
|
||||
def MessageToDict(message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False):
|
||||
"""Converts protobuf message to a JSON dictionary.
|
||||
"""Converts protobuf message to a dictionary.
|
||||
|
||||
When the dictionary is encoded to JSON, it conforms to proto3 JSON spec.
|
||||
|
||||
Args:
|
||||
message: The protocol buffers message instance to serialize.
|
||||
@@ -125,7 +135,7 @@ def MessageToDict(message,
|
||||
names to lowerCamelCase.
|
||||
|
||||
Returns:
|
||||
A dict representation of the JSON formatted protocol buffer message.
|
||||
A dict representation of the protocol buffer message.
|
||||
"""
|
||||
printer = _Printer(including_default_value_fields,
|
||||
preserving_proto_field_name)
|
||||
@@ -148,9 +158,9 @@ class _Printer(object):
|
||||
self.including_default_value_fields = including_default_value_fields
|
||||
self.preserving_proto_field_name = preserving_proto_field_name
|
||||
|
||||
def ToJsonString(self, message):
|
||||
def ToJsonString(self, message, indent, sort_keys):
|
||||
js = self._MessageToJsonObject(message)
|
||||
return json.dumps(js, indent=2)
|
||||
return json.dumps(js, indent=indent, sort_keys=sort_keys)
|
||||
|
||||
def _MessageToJsonObject(self, message):
|
||||
"""Converts message to an object according to Proto3 JSON Specification."""
|
||||
@@ -192,6 +202,14 @@ class _Printer(object):
|
||||
# Convert a repeated field.
|
||||
js[name] = [self._FieldToJsonObject(field, k)
|
||||
for k in value]
|
||||
elif field.is_extension:
|
||||
f = field
|
||||
if (f.containing_type.GetOptions().message_set_wire_format and
|
||||
f.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
|
||||
f.label == descriptor.FieldDescriptor.LABEL_OPTIONAL):
|
||||
f = f.message_type
|
||||
name = '[%s.%s]' % (f.full_name, name)
|
||||
js[name] = self._FieldToJsonObject(field, value)
|
||||
else:
|
||||
js[name] = self._FieldToJsonObject(field, value)
|
||||
|
||||
@@ -233,6 +251,8 @@ class _Printer(object):
|
||||
if enum_value is not None:
|
||||
return enum_value.name
|
||||
else:
|
||||
if field.file.syntax == 'proto3':
|
||||
return value
|
||||
raise SerializeToJsonError('Enum field contains an integer value '
|
||||
'which can not mapped to an enum value.')
|
||||
elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING:
|
||||
@@ -433,12 +453,23 @@ class _Parser(object):
|
||||
field = fields_by_json_name.get(name, None)
|
||||
if not field:
|
||||
field = message_descriptor.fields_by_name.get(name, None)
|
||||
if not field and _VALID_EXTENSION_NAME.match(name):
|
||||
if not message_descriptor.is_extendable:
|
||||
raise ParseError('Message type {0} does not have extensions'.format(
|
||||
message_descriptor.full_name))
|
||||
identifier = name[1:-1] # strip [] brackets
|
||||
identifier = '.'.join(identifier.split('.')[:-1])
|
||||
# pylint: disable=protected-access
|
||||
field = message.Extensions._FindExtensionByName(identifier)
|
||||
# pylint: enable=protected-access
|
||||
if not field:
|
||||
if self.ignore_unknown_fields:
|
||||
continue
|
||||
raise ParseError(
|
||||
'Message type "{0}" has no field named "{1}".'.format(
|
||||
message_descriptor.full_name, name))
|
||||
('Message type "{0}" has no field named "{1}".\n'
|
||||
' Available Fields(except extensions): {2}').format(
|
||||
message_descriptor.full_name, name,
|
||||
message_descriptor.fields))
|
||||
if name in names:
|
||||
raise ParseError('Message type "{0}" should not have multiple '
|
||||
'"{1}" fields.'.format(
|
||||
@@ -491,7 +522,10 @@ class _Parser(object):
|
||||
getattr(message, field.name).append(
|
||||
_ConvertScalarFieldValue(item, field))
|
||||
elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
sub_message = getattr(message, field.name)
|
||||
if field.is_extension:
|
||||
sub_message = message.Extensions[field]
|
||||
else:
|
||||
sub_message = getattr(message, field.name)
|
||||
sub_message.SetInParent()
|
||||
self.ConvertMessage(value, sub_message)
|
||||
else:
|
||||
@@ -532,8 +566,8 @@ class _Parser(object):
|
||||
|
||||
def _ConvertGenericMessage(self, value, message):
|
||||
"""Convert a JSON representation into message with FromJsonString."""
|
||||
# Durantion, Timestamp, FieldMask have FromJsonString method to do the
|
||||
# convert. Users can also call the method directly.
|
||||
# Duration, Timestamp, FieldMask have a FromJsonString method to do the
|
||||
# conversion. Users can also call the method directly.
|
||||
message.FromJsonString(value)
|
||||
|
||||
def _ConvertValueMessage(self, value, message):
|
||||
@@ -643,6 +677,9 @@ def _ConvertScalarFieldValue(value, field, require_str=False):
|
||||
raise ParseError('Invalid enum value {0} for enum type {1}.'.format(
|
||||
value, field.enum_type.full_name))
|
||||
if enum_value is None:
|
||||
if field.file.syntax == 'proto3':
|
||||
# Proto3 accepts unknown enums.
|
||||
return number
|
||||
raise ParseError('Invalid enum value {0} for enum type {1}.'.format(
|
||||
value, field.enum_type.full_name))
|
||||
return enum_value.number
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -184,9 +184,15 @@ class Message(object):
|
||||
self.Clear()
|
||||
self.MergeFromString(serialized)
|
||||
|
||||
def SerializeToString(self):
|
||||
def SerializeToString(self, **kwargs):
|
||||
"""Serializes the protocol message to a binary string.
|
||||
|
||||
Arguments:
|
||||
**kwargs: Keyword arguments to the serialize method, accepts
|
||||
the following keyword args:
|
||||
deterministic: If true, requests deterministic serialization of the
|
||||
protobuf, with predictable ordering of map keys.
|
||||
|
||||
Returns:
|
||||
A binary string representation of the message if all of the required
|
||||
fields in the message are set (i.e. the message is initialized).
|
||||
@@ -196,12 +202,18 @@ class Message(object):
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def SerializePartialToString(self):
|
||||
def SerializePartialToString(self, **kwargs):
|
||||
"""Serializes the protocol message to a binary string.
|
||||
|
||||
This method is similar to SerializeToString but doesn't check if the
|
||||
message is initialized.
|
||||
|
||||
Arguments:
|
||||
**kwargs: Keyword arguments to the serialize method, accepts
|
||||
the following keyword args:
|
||||
deterministic: If true, requests deterministic serialization of the
|
||||
protobuf, with predictable ordering of map keys.
|
||||
|
||||
Returns:
|
||||
A string representation of the partial message.
|
||||
"""
|
||||
|
||||
@@ -66,7 +66,7 @@ class MessageFactory(object):
|
||||
Returns:
|
||||
A class describing the passed in descriptor.
|
||||
"""
|
||||
if descriptor.full_name not in self._classes:
|
||||
if descriptor not in self._classes:
|
||||
descriptor_name = descriptor.name
|
||||
if str is bytes: # PY2
|
||||
descriptor_name = descriptor.name.encode('ascii', 'ignore')
|
||||
@@ -75,16 +75,16 @@ class MessageFactory(object):
|
||||
(message.Message,),
|
||||
{'DESCRIPTOR': descriptor, '__module__': None})
|
||||
# If module not set, it wrongly points to the reflection.py module.
|
||||
self._classes[descriptor.full_name] = result_class
|
||||
self._classes[descriptor] = result_class
|
||||
for field in descriptor.fields:
|
||||
if field.message_type:
|
||||
self.GetPrototype(field.message_type)
|
||||
for extension in result_class.DESCRIPTOR.extensions:
|
||||
if extension.containing_type.full_name not in self._classes:
|
||||
if extension.containing_type not in self._classes:
|
||||
self.GetPrototype(extension.containing_type)
|
||||
extended_class = self._classes[extension.containing_type.full_name]
|
||||
extended_class = self._classes[extension.containing_type]
|
||||
extended_class.RegisterExtension(extension)
|
||||
return self._classes[descriptor.full_name]
|
||||
return self._classes[descriptor]
|
||||
|
||||
def GetMessages(self, files):
|
||||
"""Gets all the messages from a specified file.
|
||||
@@ -116,9 +116,9 @@ class MessageFactory(object):
|
||||
# an error if they were different.
|
||||
|
||||
for extension in file_desc.extensions_by_name.values():
|
||||
if extension.containing_type.full_name not in self._classes:
|
||||
if extension.containing_type not in self._classes:
|
||||
self.GetPrototype(extension.containing_type)
|
||||
extended_class = self._classes[extension.containing_type.full_name]
|
||||
extended_class = self._classes[extension.containing_type]
|
||||
extended_class.RegisterExtension(extension)
|
||||
return result
|
||||
|
||||
@@ -130,13 +130,22 @@ def GetMessages(file_protos):
|
||||
"""Builds a dictionary of all the messages available in a set of files.
|
||||
|
||||
Args:
|
||||
file_protos: A sequence of file protos to build messages out of.
|
||||
file_protos: Iterable of FileDescriptorProto to build messages out of.
|
||||
|
||||
Returns:
|
||||
A dictionary mapping proto names to the message classes. This will include
|
||||
any dependent messages as well as any messages defined in the same file as
|
||||
a specified message.
|
||||
"""
|
||||
for file_proto in file_protos:
|
||||
# The cpp implementation of the protocol buffer library requires to add the
|
||||
# message in topological order of the dependency graph.
|
||||
file_by_name = {file_proto.name: file_proto for file_proto in file_protos}
|
||||
def _AddFile(file_proto):
|
||||
for dependency in file_proto.dependency:
|
||||
if dependency in file_by_name:
|
||||
# Remove from elements to be visited, in order to cut cycles.
|
||||
_AddFile(file_by_name.pop(dependency))
|
||||
_FACTORY.pool.Add(file_proto)
|
||||
while file_by_name:
|
||||
_AddFile(file_by_name.popitem()[1])
|
||||
return _FACTORY.GetMessages([file_proto.name for file_proto in file_protos])
|
||||
@@ -709,6 +709,10 @@ static PyObject* GetJsonName(PyBaseDescriptor* self, void *closure) {
|
||||
return PyString_FromCppString(_GetDescriptor(self)->json_name());
|
||||
}
|
||||
|
||||
static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
|
||||
return PyFileDescriptor_FromDescriptor(_GetDescriptor(self)->file());
|
||||
}
|
||||
|
||||
static PyObject* GetType(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->type());
|
||||
}
|
||||
@@ -899,6 +903,7 @@ static PyGetSetDef Getters[] = {
|
||||
{ "name", (getter)GetName, NULL, "Unqualified name"},
|
||||
{ "camelcase_name", (getter)GetCamelcaseName, NULL, "Camelcase name"},
|
||||
{ "json_name", (getter)GetJsonName, NULL, "Json name"},
|
||||
{ "file", (getter)GetFile, NULL, "File Descriptor"},
|
||||
{ "type", (getter)GetType, NULL, "C++ Type"},
|
||||
{ "cpp_type", (getter)GetCppType, NULL, "C++ Type"},
|
||||
{ "label", (getter)GetLabel, NULL, "Label"},
|
||||
@@ -1570,6 +1575,10 @@ static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
|
||||
return PyString_FromCppString(_GetDescriptor(self)->full_name());
|
||||
}
|
||||
|
||||
static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
|
||||
return PyFileDescriptor_FromDescriptor(_GetDescriptor(self)->file());
|
||||
}
|
||||
|
||||
static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->index());
|
||||
}
|
||||
@@ -1611,6 +1620,7 @@ static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
|
||||
static PyGetSetDef Getters[] = {
|
||||
{ "name", (getter)GetName, NULL, "Name", NULL},
|
||||
{ "full_name", (getter)GetFullName, NULL, "Full name", NULL},
|
||||
{ "file", (getter)GetFile, NULL, "File descriptor"},
|
||||
{ "index", (getter)GetIndex, NULL, "Index", NULL},
|
||||
|
||||
{ "methods", (getter)GetMethods, NULL, "Methods", NULL},
|
||||
|
||||
@@ -32,6 +32,10 @@
|
||||
// Author: tibell@google.com (Johan Tibell)
|
||||
|
||||
#include <google/protobuf/pyext/extension_dict.h>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
@@ -45,7 +49,6 @@
|
||||
#include <google/protobuf/pyext/repeated_composite_container.h>
|
||||
#include <google/protobuf/pyext/repeated_scalar_container.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#if PY_VERSION_HEX < 0x03030000
|
||||
|
||||
@@ -712,8 +712,33 @@ int MapReflectionFriend::MessageMapSetItem(PyObject* _self, PyObject* key,
|
||||
}
|
||||
|
||||
// Delete key from map.
|
||||
if (reflection->DeleteMapValue(message, self->parent_field_descriptor,
|
||||
if (reflection->ContainsMapKey(*message, self->parent_field_descriptor,
|
||||
map_key)) {
|
||||
// Delete key from CMessage dict.
|
||||
MapValueRef value;
|
||||
reflection->InsertOrLookupMapValue(message, self->parent_field_descriptor,
|
||||
map_key, &value);
|
||||
ScopedPyObjectPtr key(PyLong_FromVoidPtr(value.MutableMessageValue()));
|
||||
|
||||
PyObject* cmsg_value = PyDict_GetItem(self->message_dict, key.get());
|
||||
if (cmsg_value) {
|
||||
// Need to keep CMessage stay alive if it is still referenced after
|
||||
// deletion. Makes a new message and swaps values into CMessage
|
||||
// instead of just removing.
|
||||
CMessage* cmsg = reinterpret_cast<CMessage*>(cmsg_value);
|
||||
Message* msg = cmsg->message;
|
||||
cmsg->owner.reset(msg->New());
|
||||
cmsg->message = cmsg->owner.get();
|
||||
cmsg->parent = NULL;
|
||||
msg->GetReflection()->Swap(msg, cmsg->message);
|
||||
if (PyDict_DelItem(self->message_dict, key.get()) < 0) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
// Delete key from map.
|
||||
reflection->DeleteMapValue(message, self->parent_field_descriptor,
|
||||
map_key);
|
||||
return 0;
|
||||
} else {
|
||||
PyErr_Format(PyExc_KeyError, "Key not present in map");
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
|
||||
#include <google/protobuf/util/message_differencer.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/message.h>
|
||||
@@ -66,7 +67,6 @@
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/pyext/safe_numerics.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#define PyInt_AsLong PyLong_AsLong
|
||||
@@ -101,6 +101,17 @@ namespace message_meta {
|
||||
|
||||
static int InsertEmptyWeakref(PyTypeObject* base);
|
||||
|
||||
namespace {
|
||||
// Copied oveer from internal 'google/protobuf/stubs/strutil.h'.
|
||||
inline void UpperString(string * s) {
|
||||
string::iterator end = s->end();
|
||||
for (string::iterator i = s->begin(); i != end; ++i) {
|
||||
// toupper() changes based on locale. We don't want this!
|
||||
if ('a' <= *i && *i <= 'z') *i += 'A' - 'a';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Add the number of a field descriptor to the containing message class.
|
||||
// Equivalent to:
|
||||
// _cls.<field>_FIELD_NUMBER = <number>
|
||||
@@ -594,19 +605,21 @@ void OutOfRangeError(PyObject* arg) {
|
||||
|
||||
template<class RangeType, class ValueType>
|
||||
bool VerifyIntegerCastAndRange(PyObject* arg, ValueType value) {
|
||||
if GOOGLE_PREDICT_FALSE(value == -1 && PyErr_Occurred()) {
|
||||
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
|
||||
// Replace it with the same ValueError as pure python protos instead of
|
||||
// the default one.
|
||||
PyErr_Clear();
|
||||
if
|
||||
GOOGLE_PREDICT_FALSE(value == -1 && PyErr_Occurred()) {
|
||||
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
|
||||
// Replace it with the same ValueError as pure python protos instead of
|
||||
// the default one.
|
||||
PyErr_Clear();
|
||||
OutOfRangeError(arg);
|
||||
} // Otherwise propagate existing error.
|
||||
return false;
|
||||
}
|
||||
if
|
||||
GOOGLE_PREDICT_FALSE(!IsValidNumericCast<RangeType>(value)) {
|
||||
OutOfRangeError(arg);
|
||||
} // Otherwise propagate existing error.
|
||||
return false;
|
||||
}
|
||||
if GOOGLE_PREDICT_FALSE(!IsValidNumericCast<RangeType>(value)) {
|
||||
OutOfRangeError(arg);
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -615,25 +628,29 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
|
||||
// The fast path.
|
||||
#if PY_MAJOR_VERSION < 3
|
||||
// For the typical case, offer a fast path.
|
||||
if GOOGLE_PREDICT_TRUE(PyInt_Check(arg)) {
|
||||
long int_result = PyInt_AsLong(arg);
|
||||
if GOOGLE_PREDICT_TRUE(IsValidNumericCast<T>(int_result)) {
|
||||
*value = static_cast<T>(int_result);
|
||||
return true;
|
||||
} else {
|
||||
OutOfRangeError(arg);
|
||||
return false;
|
||||
if
|
||||
GOOGLE_PREDICT_TRUE(PyInt_Check(arg)) {
|
||||
long int_result = PyInt_AsLong(arg);
|
||||
if
|
||||
GOOGLE_PREDICT_TRUE(IsValidNumericCast<T>(int_result)) {
|
||||
*value = static_cast<T>(int_result);
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
OutOfRangeError(arg);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
// This effectively defines an integer as "an object that can be cast as
|
||||
// an integer and can be used as an ordinal number".
|
||||
// This definition includes everything that implements numbers.Integral
|
||||
// and shouldn't cast the net too wide.
|
||||
if GOOGLE_PREDICT_FALSE(!PyIndex_Check(arg)) {
|
||||
FormatTypeError(arg, "int, long");
|
||||
return false;
|
||||
}
|
||||
if
|
||||
GOOGLE_PREDICT_FALSE(!PyIndex_Check(arg)) {
|
||||
FormatTypeError(arg, "int, long");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Now we have an integral number so we can safely use PyLong_ functions.
|
||||
// We need to treat the signed and unsigned cases differently in case arg is
|
||||
@@ -647,10 +664,11 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
|
||||
// Unlike PyLong_AsLongLong, PyLong_AsUnsignedLongLong is very
|
||||
// picky about the exact type.
|
||||
PyObject* casted = PyNumber_Long(arg);
|
||||
if GOOGLE_PREDICT_FALSE(casted == NULL) {
|
||||
// Propagate existing error.
|
||||
return false;
|
||||
}
|
||||
if
|
||||
GOOGLE_PREDICT_FALSE(casted == NULL) {
|
||||
// Propagate existing error.
|
||||
return false;
|
||||
}
|
||||
ulong_result = PyLong_AsUnsignedLongLong(casted);
|
||||
Py_DECREF(casted);
|
||||
}
|
||||
@@ -672,10 +690,11 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
|
||||
// Valid subclasses of numbers.Integral should have a __long__() method
|
||||
// so fall back to that.
|
||||
PyObject* casted = PyNumber_Long(arg);
|
||||
if GOOGLE_PREDICT_FALSE(casted == NULL) {
|
||||
// Propagate existing error.
|
||||
return false;
|
||||
}
|
||||
if
|
||||
GOOGLE_PREDICT_FALSE(casted == NULL) {
|
||||
// Propagate existing error.
|
||||
return false;
|
||||
}
|
||||
long_result = PyLong_AsLongLong(casted);
|
||||
Py_DECREF(casted);
|
||||
}
|
||||
@@ -698,10 +717,11 @@ template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
|
||||
|
||||
bool CheckAndGetDouble(PyObject* arg, double* value) {
|
||||
*value = PyFloat_AsDouble(arg);
|
||||
if GOOGLE_PREDICT_FALSE(*value == -1 && PyErr_Occurred()) {
|
||||
FormatTypeError(arg, "int, long, float");
|
||||
return false;
|
||||
}
|
||||
if
|
||||
GOOGLE_PREDICT_FALSE(*value == -1 && PyErr_Occurred()) {
|
||||
FormatTypeError(arg, "int, long, float");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1055,13 +1075,15 @@ int InternalDeleteRepeatedField(
|
||||
|
||||
if (PySlice_Check(slice)) {
|
||||
from = to = step = slice_length = 0;
|
||||
PySlice_GetIndicesEx(
|
||||
#if PY_MAJOR_VERSION < 3
|
||||
PySlice_GetIndicesEx(
|
||||
reinterpret_cast<PySliceObject*>(slice),
|
||||
#else
|
||||
slice,
|
||||
#endif
|
||||
length, &from, &to, &step, &slice_length);
|
||||
#else
|
||||
PySlice_GetIndicesEx(
|
||||
slice,
|
||||
length, &from, &to, &step, &slice_length);
|
||||
#endif
|
||||
if (from < to) {
|
||||
min = from;
|
||||
max = to - 1;
|
||||
@@ -1540,20 +1562,7 @@ PyObject* HasField(CMessage* self, PyObject* arg) {
|
||||
if (message->GetReflection()->HasField(*message, field_descriptor)) {
|
||||
Py_RETURN_TRUE;
|
||||
}
|
||||
if (!message->GetReflection()->SupportsUnknownEnumValues() &&
|
||||
field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
|
||||
// Special case: Python HasField() differs in semantics from C++
|
||||
// slightly: we return HasField('enum_field') == true if there is
|
||||
// an unknown enum value present. To implement this we have to
|
||||
// look in the UnknownFieldSet.
|
||||
const UnknownFieldSet& unknown_field_set =
|
||||
message->GetReflection()->GetUnknownFields(*message);
|
||||
for (int i = 0; i < unknown_field_set.field_count(); ++i) {
|
||||
if (unknown_field_set.field(i).number() == field_descriptor->number()) {
|
||||
Py_RETURN_TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
|
||||
@@ -1732,12 +1741,6 @@ PyObject* ClearFieldByDescriptor(
|
||||
AssureWritable(self);
|
||||
Message* message = self->message;
|
||||
message->GetReflection()->ClearField(message, field_descriptor);
|
||||
if (field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_ENUM &&
|
||||
!message->GetReflection()->SupportsUnknownEnumValues()) {
|
||||
UnknownFieldSet* unknown_field_set =
|
||||
message->GetReflection()->MutableUnknownFields(message);
|
||||
unknown_field_set->DeleteByNumber(field_descriptor->number());
|
||||
}
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -1808,8 +1811,25 @@ static string GetMessageName(CMessage* self) {
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject* SerializeToString(CMessage* self, PyObject* args) {
|
||||
if (!self->message->IsInitialized()) {
|
||||
static PyObject* InternalSerializeToString(
|
||||
CMessage* self, PyObject* args, PyObject* kwargs,
|
||||
bool require_initialized) {
|
||||
// Parse the "deterministic" kwarg; defaults to False.
|
||||
static char* kwlist[] = { "deterministic", 0 };
|
||||
PyObject* deterministic_obj = Py_None;
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", kwlist,
|
||||
&deterministic_obj)) {
|
||||
return NULL;
|
||||
}
|
||||
// Preemptively convert to a bool first, so we don't need to back out of
|
||||
// allocating memory if this raises an exception.
|
||||
// NOTE: This is unused later if deterministic == Py_None, but that's fine.
|
||||
int deterministic = PyObject_IsTrue(deterministic_obj);
|
||||
if (deterministic < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (require_initialized && !self->message->IsInitialized()) {
|
||||
ScopedPyObjectPtr errors(FindInitializationErrors(self));
|
||||
if (errors == NULL) {
|
||||
return NULL;
|
||||
@@ -1847,24 +1867,36 @@ static PyObject* SerializeToString(CMessage* self, PyObject* args) {
|
||||
GetMessageName(self).c_str(), PyString_AsString(joined.get()));
|
||||
return NULL;
|
||||
}
|
||||
int size = self->message->ByteSize();
|
||||
if (size <= 0) {
|
||||
|
||||
// Ok, arguments parsed and errors checked, now encode to a string
|
||||
const size_t size = self->message->ByteSizeLong();
|
||||
if (size == 0) {
|
||||
return PyBytes_FromString("");
|
||||
}
|
||||
PyObject* result = PyBytes_FromStringAndSize(NULL, size);
|
||||
if (result == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
char* buffer = PyBytes_AS_STRING(result);
|
||||
self->message->SerializeWithCachedSizesToArray(
|
||||
reinterpret_cast<uint8*>(buffer));
|
||||
io::ArrayOutputStream out(PyBytes_AS_STRING(result), size);
|
||||
io::CodedOutputStream coded_out(&out);
|
||||
if (deterministic_obj != Py_None) {
|
||||
coded_out.SetSerializationDeterministic(deterministic);
|
||||
}
|
||||
self->message->SerializeWithCachedSizes(&coded_out);
|
||||
GOOGLE_CHECK(!coded_out.HadError());
|
||||
return result;
|
||||
}
|
||||
|
||||
static PyObject* SerializePartialToString(CMessage* self) {
|
||||
string contents;
|
||||
self->message->SerializePartialToString(&contents);
|
||||
return PyBytes_FromStringAndSize(contents.c_str(), contents.size());
|
||||
static PyObject* SerializeToString(
|
||||
CMessage* self, PyObject* args, PyObject* kwargs) {
|
||||
return InternalSerializeToString(self, args, kwargs,
|
||||
/*require_initialized=*/true);
|
||||
}
|
||||
|
||||
static PyObject* SerializePartialToString(
|
||||
CMessage* self, PyObject* args, PyObject* kwargs) {
|
||||
return InternalSerializeToString(self, args, kwargs,
|
||||
/*require_initialized=*/false);
|
||||
}
|
||||
|
||||
// Formats proto fields for ascii dumps using python formatting functions where
|
||||
@@ -2033,6 +2065,11 @@ static PyObject* MergeFromString(CMessage* self, PyObject* arg) {
|
||||
input.SetExtensionRegistry(factory->pool->pool, factory->message_factory);
|
||||
bool success = self->message->MergePartialFromCodedStream(&input);
|
||||
if (success) {
|
||||
if (!input.ConsumedEntireMessage()) {
|
||||
// TODO(jieluo): Raise error and return NULL instead.
|
||||
// b/27494216
|
||||
PyErr_Warn(NULL, "Unexpected end-group tag: Not all data was converted");
|
||||
}
|
||||
return PyInt_FromLong(input.CurrentPosition());
|
||||
} else {
|
||||
PyErr_Format(DecodeError_class, "Error parsing message");
|
||||
@@ -2303,27 +2340,9 @@ PyObject* InternalGetScalar(const Message* message,
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_ENUM: {
|
||||
if (!message->GetReflection()->SupportsUnknownEnumValues() &&
|
||||
!message->GetReflection()->HasField(*message, field_descriptor)) {
|
||||
// Look for the value in the unknown fields.
|
||||
const UnknownFieldSet& unknown_field_set =
|
||||
message->GetReflection()->GetUnknownFields(*message);
|
||||
for (int i = 0; i < unknown_field_set.field_count(); ++i) {
|
||||
if (unknown_field_set.field(i).number() ==
|
||||
field_descriptor->number() &&
|
||||
unknown_field_set.field(i).type() ==
|
||||
google::protobuf::UnknownField::TYPE_VARINT) {
|
||||
result = PyInt_FromLong(unknown_field_set.field(i).varint());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (result == NULL) {
|
||||
const EnumValueDescriptor* enum_value =
|
||||
message->GetReflection()->GetEnum(*message, field_descriptor);
|
||||
result = PyInt_FromLong(enum_value->number());
|
||||
}
|
||||
const EnumValueDescriptor* enum_value =
|
||||
message->GetReflection()->GetEnum(*message, field_descriptor);
|
||||
result = PyInt_FromLong(enum_value->number());
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -2535,7 +2554,10 @@ PyObject* Reduce(CMessage* self) {
|
||||
if (state == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr serialized(SerializePartialToString(self));
|
||||
string contents;
|
||||
self->message->SerializePartialToString(&contents);
|
||||
ScopedPyObjectPtr serialized(
|
||||
PyBytes_FromStringAndSize(contents.c_str(), contents.size()));
|
||||
if (serialized == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -2656,9 +2678,10 @@ static PyMethodDef Methods[] = {
|
||||
{ "RegisterExtension", (PyCFunction)RegisterExtension, METH_O | METH_CLASS,
|
||||
"Registers an extension with the current message." },
|
||||
{ "SerializePartialToString", (PyCFunction)SerializePartialToString,
|
||||
METH_NOARGS,
|
||||
METH_VARARGS | METH_KEYWORDS,
|
||||
"Serializes the message to a string, even if it isn't initialized." },
|
||||
{ "SerializeToString", (PyCFunction)SerializeToString, METH_NOARGS,
|
||||
{ "SerializeToString", (PyCFunction)SerializeToString,
|
||||
METH_VARARGS | METH_KEYWORDS,
|
||||
"Serializes the message to a string, only for initialized messages." },
|
||||
{ "SetInParent", (PyCFunction)SetInParent, METH_NOARGS,
|
||||
"Sets the has bit of the given field in its parent message." },
|
||||
@@ -3041,5 +3064,4 @@ bool InitProto2MessageModule(PyObject *m) {
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
@@ -133,11 +133,7 @@ int RegisterMessageClass(PyMessageFactory* self,
|
||||
CMessageClass* GetOrCreateMessageClass(PyMessageFactory* self,
|
||||
const Descriptor* descriptor) {
|
||||
// This is the same implementation as MessageFactory.GetPrototype().
|
||||
ScopedPyObjectPtr py_descriptor(
|
||||
PyMessageDescriptor_FromDescriptor(descriptor));
|
||||
if (py_descriptor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Do not create a MessageClass that already exists.
|
||||
hash_map<const Descriptor*, CMessageClass*>::iterator it =
|
||||
self->classes_by_descriptor->find(descriptor);
|
||||
@@ -145,6 +141,11 @@ CMessageClass* GetOrCreateMessageClass(PyMessageFactory* self,
|
||||
Py_INCREF(it->second);
|
||||
return it->second;
|
||||
}
|
||||
ScopedPyObjectPtr py_descriptor(
|
||||
PyMessageDescriptor_FromDescriptor(descriptor));
|
||||
if (py_descriptor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
// Create a new message class.
|
||||
ScopedPyObjectPtr args(Py_BuildValue(
|
||||
"s(){sOsOsO}", descriptor->name().c_str(),
|
||||
|
||||
@@ -28,8 +28,33 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
#include <google/protobuf/message_lite.h>
|
||||
|
||||
static PyObject* GetPythonProto3PreserveUnknownsDefault(
|
||||
PyObject* /*m*/, PyObject* /*args*/) {
|
||||
if (google::protobuf::internal::GetProto3PreserveUnknownsDefault()) {
|
||||
Py_RETURN_TRUE;
|
||||
} else {
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject* SetPythonProto3PreserveUnknownsDefault(
|
||||
PyObject* /*m*/, PyObject* arg) {
|
||||
if (!arg || !PyBool_Check(arg)) {
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError,
|
||||
"Argument to SetPythonProto3PreserveUnknownsDefault must be boolean");
|
||||
return NULL;
|
||||
}
|
||||
google::protobuf::internal::SetProto3PreserveUnknownsDefault(PyObject_IsTrue(arg));
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static const char module_docstring[] =
|
||||
"python-proto2 is a module that can be used to enhance proto2 Python API\n"
|
||||
"performance.\n"
|
||||
@@ -41,6 +66,14 @@ static PyMethodDef ModuleMethods[] = {
|
||||
{"SetAllowOversizeProtos",
|
||||
(PyCFunction)google::protobuf::python::cmessage::SetAllowOversizeProtos,
|
||||
METH_O, "Enable/disable oversize proto parsing."},
|
||||
// DO NOT USE: For migration and testing only.
|
||||
{"GetPythonProto3PreserveUnknownsDefault",
|
||||
(PyCFunction)GetPythonProto3PreserveUnknownsDefault,
|
||||
METH_NOARGS, "Get Proto3 preserve unknowns default."},
|
||||
// DO NOT USE: For migration and testing only.
|
||||
{"SetPythonProto3PreserveUnknownsDefault",
|
||||
(PyCFunction)SetPythonProto3PreserveUnknownsDefault,
|
||||
METH_O, "Enable/disable proto3 unknowns preservation."},
|
||||
{ NULL, NULL}
|
||||
};
|
||||
|
||||
|
||||
@@ -58,11 +58,11 @@ message ForeignMessage {
|
||||
repeated int32 d = 2;
|
||||
}
|
||||
|
||||
message TestAllExtensions {
|
||||
message TestAllExtensions { // extension begin
|
||||
extensions 1 to max;
|
||||
}
|
||||
} // extension end
|
||||
|
||||
extend TestAllExtensions {
|
||||
extend TestAllExtensions { // extension begin
|
||||
optional TestAllTypes.NestedMessage optional_nested_message_extension = 1;
|
||||
repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 2;
|
||||
}
|
||||
} // extension end
|
||||
@@ -30,7 +30,7 @@ optional_nested_message_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
REPEATED_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER = 2
|
||||
repeated_nested_message_extension = _descriptor.FieldDescriptor(
|
||||
name='repeated_nested_message_extension', full_name='google.protobuf.python.internal.repeated_nested_message_extension', index=1,
|
||||
@@ -38,7 +38,7 @@ repeated_nested_message_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTALLTYPES_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
@@ -54,14 +54,14 @@ _TESTALLTYPES_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='cc', full_name='google.protobuf.python.internal.TestAllTypes.NestedMessage.cc', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -91,21 +91,21 @@ _TESTALLTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_message', full_name='google.protobuf.python.internal.TestAllTypes.optional_nested_message', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_int32', full_name='google.protobuf.python.internal.TestAllTypes.optional_int32', index=2,
|
||||
number=3, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -136,14 +136,14 @@ _FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='d', full_name='google.protobuf.python.internal.ForeignMessage.d', index=1,
|
||||
number=2, type=5, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
#include <google/protobuf/pyext/descriptor_pool.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
#include <google/protobuf/reflection.h>
|
||||
|
||||
@@ -137,9 +138,12 @@ static PyObject* AddToAttached(RepeatedCompositeContainer* self,
|
||||
if (cmessage::AssureWritable(self->parent) == -1)
|
||||
return NULL;
|
||||
Message* message = self->message;
|
||||
|
||||
Message* sub_message =
|
||||
message->GetReflection()->AddMessage(message,
|
||||
self->parent_field_descriptor);
|
||||
message->GetReflection()->AddMessage(
|
||||
message,
|
||||
self->parent_field_descriptor,
|
||||
self->child_message_class->py_message_factory->message_factory);
|
||||
CMessage* cmsg = cmessage::NewEmptyMessage(self->child_message_class);
|
||||
if (cmsg == NULL)
|
||||
return NULL;
|
||||
@@ -266,10 +270,11 @@ int AssignSubscript(RepeatedCompositeContainer* self,
|
||||
if (PySlice_Check(slice)) {
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
if (PySlice_GetIndicesEx(slice,
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
#else
|
||||
if (PySlice_GetIndicesEx(reinterpret_cast<PySliceObject*>(slice),
|
||||
#endif
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
return PySequence_DelSlice(self->child_messages, from, to);
|
||||
@@ -335,6 +340,18 @@ static PyObject* RichCompare(RepeatedCompositeContainer* self,
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject* ToStr(RepeatedCompositeContainer* self) {
|
||||
ScopedPyObjectPtr full_slice(PySlice_New(NULL, NULL, NULL));
|
||||
if (full_slice == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
|
||||
if (list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
return PyObject_Repr(list.get());
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// sort()
|
||||
|
||||
@@ -607,7 +624,7 @@ PyTypeObject RepeatedCompositeContainer_Type = {
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
(reprfunc)repeated_composite_container::ToStr, // tp_repr
|
||||
0, // tp_as_number
|
||||
&repeated_composite_container::SqMethods, // tp_as_sequence
|
||||
&repeated_composite_container::MpMethods, // tp_as_mapping
|
||||
|
||||
@@ -261,22 +261,6 @@ static PyObject* Item(RepeatedScalarContainer* self, Py_ssize_t index) {
|
||||
result = ToStringObject(field_descriptor, value);
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_MESSAGE: {
|
||||
PyObject* py_cmsg = PyObject_CallObject(reinterpret_cast<PyObject*>(
|
||||
&CMessage_Type), NULL);
|
||||
if (py_cmsg == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
CMessage* cmsg = reinterpret_cast<CMessage*>(py_cmsg);
|
||||
const Message& msg = reflection->GetRepeatedMessage(
|
||||
*message, field_descriptor, index);
|
||||
cmsg->owner = self->owner;
|
||||
cmsg->parent = self->parent;
|
||||
cmsg->message = const_cast<Message*>(&msg);
|
||||
cmsg->read_only = false;
|
||||
result = reinterpret_cast<PyObject*>(py_cmsg);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
PyErr_Format(
|
||||
PyExc_SystemError,
|
||||
@@ -305,10 +289,12 @@ static PyObject* Subscript(RepeatedScalarContainer* self, PyObject* slice) {
|
||||
length = Len(self);
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
if (PySlice_GetIndicesEx(slice,
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
#else
|
||||
if (PySlice_GetIndicesEx(reinterpret_cast<PySliceObject*>(slice),
|
||||
#endif
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
return_list = true;
|
||||
@@ -458,10 +444,11 @@ static int AssSubscript(RepeatedScalarContainer* self,
|
||||
length = reflection->FieldSize(*message, field_descriptor);
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
if (PySlice_GetIndicesEx(slice,
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
#else
|
||||
if (PySlice_GetIndicesEx(reinterpret_cast<PySliceObject*>(slice),
|
||||
#endif
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
create_list = true;
|
||||
@@ -656,6 +643,18 @@ static PyObject* Pop(RepeatedScalarContainer* self,
|
||||
return item;
|
||||
}
|
||||
|
||||
static PyObject* ToStr(RepeatedScalarContainer* self) {
|
||||
ScopedPyObjectPtr full_slice(PySlice_New(NULL, NULL, NULL));
|
||||
if (full_slice == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
|
||||
if (list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
return PyObject_Repr(list.get());
|
||||
}
|
||||
|
||||
// The private constructor of RepeatedScalarContainer objects.
|
||||
PyObject *NewContainer(
|
||||
CMessage* parent, const FieldDescriptor* parent_field_descriptor) {
|
||||
@@ -778,7 +777,7 @@ PyTypeObject RepeatedScalarContainer_Type = {
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
(reprfunc)repeated_scalar_container::ToStr, // tp_repr
|
||||
0, // tp_as_number
|
||||
&repeated_scalar_container::SqMethods, // tp_as_sequence
|
||||
&repeated_scalar_container::MpMethods, // tp_as_mapping
|
||||
|
||||
@@ -38,7 +38,7 @@ _SOURCECONTEXT = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -59,14 +59,14 @@ _STRUCT_FIELDSENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.Struct.FieldsEntry.value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -96,7 +96,7 @@ _STRUCT = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -127,42 +127,42 @@ _VALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='number_value', full_name='google.protobuf.Value.number_value', index=1,
|
||||
number=2, type=1, cpp_type=5, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='string_value', full_name='google.protobuf.Value.string_value', index=2,
|
||||
number=3, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bool_value', full_name='google.protobuf.Value.bool_value', index=3,
|
||||
number=4, type=8, cpp_type=7, label=1,
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='struct_value', full_name='google.protobuf.Value.struct_value', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='list_value', full_name='google.protobuf.Value.list_value', index=5,
|
||||
number=6, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -196,7 +196,7 @@ _LISTVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -78,10 +78,18 @@ class SymbolDatabase(message_factory.MessageFactory):
|
||||
"""
|
||||
|
||||
desc = message.DESCRIPTOR
|
||||
self._classes[desc.full_name] = message
|
||||
self.pool.AddDescriptor(desc)
|
||||
self._classes[desc] = message
|
||||
self.RegisterMessageDescriptor(desc)
|
||||
return message
|
||||
|
||||
def RegisterMessageDescriptor(self, message_descriptor):
|
||||
"""Registers the given message descriptor in the local database.
|
||||
|
||||
Args:
|
||||
message_descriptor: a descriptor.MessageDescriptor.
|
||||
"""
|
||||
self.pool.AddDescriptor(message_descriptor)
|
||||
|
||||
def RegisterEnumDescriptor(self, enum_descriptor):
|
||||
"""Registers the given enum descriptor in the local database.
|
||||
|
||||
@@ -132,7 +140,7 @@ class SymbolDatabase(message_factory.MessageFactory):
|
||||
KeyError: if the symbol could not be found.
|
||||
"""
|
||||
|
||||
return self._classes[symbol]
|
||||
return self._classes[self.pool.FindMessageTypeByName(symbol)]
|
||||
|
||||
def GetMessages(self, files):
|
||||
# TODO(amauryfa): Fix the differences with MessageFactory.
|
||||
@@ -153,20 +161,20 @@ class SymbolDatabase(message_factory.MessageFactory):
|
||||
KeyError: if a file could not be found.
|
||||
"""
|
||||
|
||||
def _GetAllMessageNames(desc):
|
||||
def _GetAllMessages(desc):
|
||||
"""Walk a message Descriptor and recursively yields all message names."""
|
||||
yield desc.full_name
|
||||
yield desc
|
||||
for msg_desc in desc.nested_types:
|
||||
for full_name in _GetAllMessageNames(msg_desc):
|
||||
yield full_name
|
||||
for nested_desc in _GetAllMessages(msg_desc):
|
||||
yield nested_desc
|
||||
|
||||
result = {}
|
||||
for file_name in files:
|
||||
file_desc = self.pool.FindFileByName(file_name)
|
||||
for msg_desc in file_desc.message_types_by_name.values():
|
||||
for full_name in _GetAllMessageNames(msg_desc):
|
||||
for desc in _GetAllMessages(msg_desc):
|
||||
try:
|
||||
result[full_name] = self._classes[full_name]
|
||||
result[desc.full_name] = self._classes[desc]
|
||||
except KeyError:
|
||||
# This descriptor has no registered class, skip it.
|
||||
pass
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -126,7 +126,8 @@ def MessageToString(message,
|
||||
float_format=None,
|
||||
use_field_number=False,
|
||||
descriptor_pool=None,
|
||||
indent=0):
|
||||
indent=0,
|
||||
message_formatter=None):
|
||||
"""Convert protobuf message to text format.
|
||||
|
||||
Floating point values can be formatted compactly with 15 digits of
|
||||
@@ -148,6 +149,9 @@ def MessageToString(message,
|
||||
use_field_number: If True, print field numbers instead of names.
|
||||
descriptor_pool: A DescriptorPool used to resolve Any types.
|
||||
indent: The indent level, in terms of spaces, for pretty print.
|
||||
message_formatter: A function(message, indent, as_one_line): unicode|None
|
||||
to custom format selected sub-messages (usually based on message type).
|
||||
Use to pretty print parts of the protobuf for easier diffing.
|
||||
|
||||
Returns:
|
||||
A string of the text formatted protocol buffer message.
|
||||
@@ -155,7 +159,7 @@ def MessageToString(message,
|
||||
out = TextWriter(as_utf8)
|
||||
printer = _Printer(out, indent, as_utf8, as_one_line, pointy_brackets,
|
||||
use_index_order, float_format, use_field_number,
|
||||
descriptor_pool)
|
||||
descriptor_pool, message_formatter)
|
||||
printer.PrintMessage(message)
|
||||
result = out.getvalue()
|
||||
out.close()
|
||||
@@ -179,10 +183,11 @@ def PrintMessage(message,
|
||||
use_index_order=False,
|
||||
float_format=None,
|
||||
use_field_number=False,
|
||||
descriptor_pool=None):
|
||||
descriptor_pool=None,
|
||||
message_formatter=None):
|
||||
printer = _Printer(out, indent, as_utf8, as_one_line, pointy_brackets,
|
||||
use_index_order, float_format, use_field_number,
|
||||
descriptor_pool)
|
||||
descriptor_pool, message_formatter)
|
||||
printer.PrintMessage(message)
|
||||
|
||||
|
||||
@@ -194,10 +199,11 @@ def PrintField(field,
|
||||
as_one_line=False,
|
||||
pointy_brackets=False,
|
||||
use_index_order=False,
|
||||
float_format=None):
|
||||
float_format=None,
|
||||
message_formatter=None):
|
||||
"""Print a single field name/value pair."""
|
||||
printer = _Printer(out, indent, as_utf8, as_one_line, pointy_brackets,
|
||||
use_index_order, float_format)
|
||||
use_index_order, float_format, message_formatter)
|
||||
printer.PrintField(field, value)
|
||||
|
||||
|
||||
@@ -209,10 +215,11 @@ def PrintFieldValue(field,
|
||||
as_one_line=False,
|
||||
pointy_brackets=False,
|
||||
use_index_order=False,
|
||||
float_format=None):
|
||||
float_format=None,
|
||||
message_formatter=None):
|
||||
"""Print a single field value (not including name)."""
|
||||
printer = _Printer(out, indent, as_utf8, as_one_line, pointy_brackets,
|
||||
use_index_order, float_format)
|
||||
use_index_order, float_format, message_formatter)
|
||||
printer.PrintFieldValue(field, value)
|
||||
|
||||
|
||||
@@ -228,6 +235,9 @@ def _BuildMessageFromTypeName(type_name, descriptor_pool):
|
||||
wasn't found matching type_name.
|
||||
"""
|
||||
# pylint: disable=g-import-not-at-top
|
||||
if descriptor_pool is None:
|
||||
from google.protobuf import descriptor_pool as pool_mod
|
||||
descriptor_pool = pool_mod.Default()
|
||||
from google.protobuf import symbol_database
|
||||
database = symbol_database.Default()
|
||||
try:
|
||||
@@ -250,7 +260,8 @@ class _Printer(object):
|
||||
use_index_order=False,
|
||||
float_format=None,
|
||||
use_field_number=False,
|
||||
descriptor_pool=None):
|
||||
descriptor_pool=None,
|
||||
message_formatter=None):
|
||||
"""Initialize the Printer.
|
||||
|
||||
Floating point values can be formatted compactly with 15 digits of
|
||||
@@ -273,6 +284,9 @@ class _Printer(object):
|
||||
used.
|
||||
use_field_number: If True, print field numbers instead of names.
|
||||
descriptor_pool: A DescriptorPool used to resolve Any types.
|
||||
message_formatter: A function(message, indent, as_one_line): unicode|None
|
||||
to custom format selected sub-messages (usually based on message type).
|
||||
Use to pretty print parts of the protobuf for easier diffing.
|
||||
"""
|
||||
self.out = out
|
||||
self.indent = indent
|
||||
@@ -283,6 +297,7 @@ class _Printer(object):
|
||||
self.float_format = float_format
|
||||
self.use_field_number = use_field_number
|
||||
self.descriptor_pool = descriptor_pool
|
||||
self.message_formatter = message_formatter
|
||||
|
||||
def _TryPrintAsAnyMessage(self, message):
|
||||
"""Serializes if message is a google.protobuf.Any field."""
|
||||
@@ -297,14 +312,27 @@ class _Printer(object):
|
||||
else:
|
||||
return False
|
||||
|
||||
def _TryCustomFormatMessage(self, message):
|
||||
formatted = self.message_formatter(message, self.indent, self.as_one_line)
|
||||
if formatted is None:
|
||||
return False
|
||||
|
||||
out = self.out
|
||||
out.write(' ' * self.indent)
|
||||
out.write(formatted)
|
||||
out.write(' ' if self.as_one_line else '\n')
|
||||
return True
|
||||
|
||||
def PrintMessage(self, message):
|
||||
"""Convert protobuf message to text format.
|
||||
|
||||
Args:
|
||||
message: The protocol buffers message.
|
||||
"""
|
||||
if self.message_formatter and self._TryCustomFormatMessage(message):
|
||||
return
|
||||
if (message.DESCRIPTOR.full_name == _ANY_FULL_TYPE_NAME and
|
||||
self.descriptor_pool and self._TryPrintAsAnyMessage(message)):
|
||||
self._TryPrintAsAnyMessage(message)):
|
||||
return
|
||||
fields = message.ListFields()
|
||||
if self.use_index_order:
|
||||
@@ -426,6 +454,22 @@ def Parse(text,
|
||||
descriptor_pool=None):
|
||||
"""Parses a text representation of a protocol message into a message.
|
||||
|
||||
NOTE: for historical reasons this function does not clear the input
|
||||
message. This is different from what the binary msg.ParseFrom(...) does.
|
||||
|
||||
Example
|
||||
a = MyProto()
|
||||
a.repeated_field.append('test')
|
||||
b = MyProto()
|
||||
|
||||
text_format.Parse(repr(a), b)
|
||||
text_format.Parse(repr(a), b) # repeated_field contains ["test", "test"]
|
||||
|
||||
# Binary version:
|
||||
b.ParseFromString(a.SerializeToString()) # repeated_field is now "test"
|
||||
|
||||
Caller is responsible for clearing the message as needed.
|
||||
|
||||
Args:
|
||||
text: Message text representation.
|
||||
message: A protocol buffer message to merge into.
|
||||
@@ -441,7 +485,10 @@ def Parse(text,
|
||||
ParseError: On text parsing problems.
|
||||
"""
|
||||
if not isinstance(text, str):
|
||||
text = text.decode('utf-8')
|
||||
if six.PY3:
|
||||
text = text.decode('utf-8')
|
||||
else:
|
||||
text = text.encode('utf-8')
|
||||
return ParseLines(text.split('\n'),
|
||||
message,
|
||||
allow_unknown_extension,
|
||||
@@ -473,6 +520,11 @@ def Merge(text,
|
||||
Raises:
|
||||
ParseError: On text parsing problems.
|
||||
"""
|
||||
if not isinstance(text, str):
|
||||
if six.PY3:
|
||||
text = text.decode('utf-8')
|
||||
else:
|
||||
text = text.encode('utf-8')
|
||||
return MergeLines(
|
||||
text.split('\n'),
|
||||
message,
|
||||
@@ -593,11 +645,6 @@ class _Parser(object):
|
||||
ParseError: In case of text parsing problems.
|
||||
"""
|
||||
message_descriptor = message.DESCRIPTOR
|
||||
if (hasattr(message_descriptor, 'syntax') and
|
||||
message_descriptor.syntax == 'proto3'):
|
||||
# Proto3 doesn't represent presence so we can't test if multiple
|
||||
# scalars have occurred. We have to allow them.
|
||||
self._allow_multiple_scalars = True
|
||||
if tokenizer.TryConsume('['):
|
||||
name = [tokenizer.ConsumeIdentifier()]
|
||||
while tokenizer.TryConsume('.'):
|
||||
@@ -616,7 +663,11 @@ class _Parser(object):
|
||||
field = None
|
||||
else:
|
||||
raise tokenizer.ParseErrorPreviousToken(
|
||||
'Extension "%s" not registered.' % name)
|
||||
'Extension "%s" not registered. '
|
||||
'Did you import the _pb2 module which defines it? '
|
||||
'If you are trying to place the extension in the MessageSet '
|
||||
'field of another message that is in an Any or MessageSet field, '
|
||||
'that message\'s _pb2 module must be imported as well' % name)
|
||||
elif message_descriptor != field.containing_type:
|
||||
raise tokenizer.ParseErrorPreviousToken(
|
||||
'Extension "%s" does not extend message type "%s".' %
|
||||
@@ -695,17 +746,17 @@ class _Parser(object):
|
||||
def _ConsumeAnyTypeUrl(self, tokenizer):
|
||||
"""Consumes a google.protobuf.Any type URL and returns the type name."""
|
||||
# Consume "type.googleapis.com/".
|
||||
tokenizer.ConsumeIdentifier()
|
||||
prefix = [tokenizer.ConsumeIdentifier()]
|
||||
tokenizer.Consume('.')
|
||||
tokenizer.ConsumeIdentifier()
|
||||
prefix.append(tokenizer.ConsumeIdentifier())
|
||||
tokenizer.Consume('.')
|
||||
tokenizer.ConsumeIdentifier()
|
||||
prefix.append(tokenizer.ConsumeIdentifier())
|
||||
tokenizer.Consume('/')
|
||||
# Consume the fully-qualified type name.
|
||||
name = [tokenizer.ConsumeIdentifier()]
|
||||
while tokenizer.TryConsume('.'):
|
||||
name.append(tokenizer.ConsumeIdentifier())
|
||||
return '.'.join(name)
|
||||
return '.'.join(prefix), '.'.join(name)
|
||||
|
||||
def _MergeMessageField(self, tokenizer, message, field):
|
||||
"""Merges a single scalar field into a message.
|
||||
@@ -728,7 +779,7 @@ class _Parser(object):
|
||||
|
||||
if (field.message_type.full_name == _ANY_FULL_TYPE_NAME and
|
||||
tokenizer.TryConsume('[')):
|
||||
packed_type_name = self._ConsumeAnyTypeUrl(tokenizer)
|
||||
type_url_prefix, packed_type_name = self._ConsumeAnyTypeUrl(tokenizer)
|
||||
tokenizer.Consume(']')
|
||||
tokenizer.TryConsume(':')
|
||||
if tokenizer.TryConsume('<'):
|
||||
@@ -736,8 +787,6 @@ class _Parser(object):
|
||||
else:
|
||||
tokenizer.Consume('{')
|
||||
expanded_any_end_token = '}'
|
||||
if not self.descriptor_pool:
|
||||
raise ParseError('Descriptor pool required to parse expanded Any field')
|
||||
expanded_any_sub_message = _BuildMessageFromTypeName(packed_type_name,
|
||||
self.descriptor_pool)
|
||||
if not expanded_any_sub_message:
|
||||
@@ -752,7 +801,8 @@ class _Parser(object):
|
||||
any_message = getattr(message, field.name).add()
|
||||
else:
|
||||
any_message = getattr(message, field.name)
|
||||
any_message.Pack(expanded_any_sub_message)
|
||||
any_message.Pack(expanded_any_sub_message,
|
||||
type_url_prefix=type_url_prefix)
|
||||
elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
if field.is_extension:
|
||||
sub_message = message.Extensions[field].add()
|
||||
@@ -780,6 +830,12 @@ class _Parser(object):
|
||||
else:
|
||||
getattr(message, field.name)[sub_message.key] = sub_message.value
|
||||
|
||||
@staticmethod
|
||||
def _IsProto3Syntax(message):
|
||||
message_descriptor = message.DESCRIPTOR
|
||||
return (hasattr(message_descriptor, 'syntax') and
|
||||
message_descriptor.syntax == 'proto3')
|
||||
|
||||
def _MergeScalarField(self, tokenizer, message, field):
|
||||
"""Merges a single scalar field into a message.
|
||||
|
||||
@@ -829,15 +885,20 @@ class _Parser(object):
|
||||
else:
|
||||
getattr(message, field.name).append(value)
|
||||
else:
|
||||
# Proto3 doesn't represent presence so we can't test if multiple scalars
|
||||
# have occurred. We have to allow them.
|
||||
can_check_presence = not self._IsProto3Syntax(message)
|
||||
if field.is_extension:
|
||||
if not self._allow_multiple_scalars and message.HasExtension(field):
|
||||
if (not self._allow_multiple_scalars and can_check_presence and
|
||||
message.HasExtension(field)):
|
||||
raise tokenizer.ParseErrorPreviousToken(
|
||||
'Message type "%s" should not have multiple "%s" extensions.' %
|
||||
(message.DESCRIPTOR.full_name, field.full_name))
|
||||
else:
|
||||
message.Extensions[field] = value
|
||||
else:
|
||||
if not self._allow_multiple_scalars and message.HasField(field.name):
|
||||
if (not self._allow_multiple_scalars and can_check_presence and
|
||||
message.HasField(field.name)):
|
||||
raise tokenizer.ParseErrorPreviousToken(
|
||||
'Message type "%s" should not have multiple "%s" fields.' %
|
||||
(message.DESCRIPTOR.full_name, field.name))
|
||||
@@ -1088,7 +1149,7 @@ class Tokenizer(object):
|
||||
"""
|
||||
result = self.token
|
||||
if not self._IDENTIFIER_OR_NUMBER.match(result):
|
||||
raise self.ParseError('Expected identifier or number.')
|
||||
raise self.ParseError('Expected identifier or number, got %s.' % result)
|
||||
self.NextToken()
|
||||
return result
|
||||
|
||||
@@ -1506,6 +1567,11 @@ def ParseEnum(field, value):
|
||||
(enum_descriptor.full_name, value))
|
||||
else:
|
||||
# Numeric value.
|
||||
if hasattr(field.file, 'syntax'):
|
||||
# Attribute is checked for compatibility.
|
||||
if field.file.syntax == 'proto3':
|
||||
# Proto3 accept numeric unknown enums.
|
||||
return number
|
||||
enum_value = enum_descriptor.values_by_number.get(number, None)
|
||||
if enum_value is None:
|
||||
raise ValueError('Enum type "%s" has no value with number %d.' %
|
||||
|
||||
@@ -38,14 +38,14 @@ _TIMESTAMP = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nanos', full_name='google.protobuf.Timestamp.nanos', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -187,42 +187,42 @@ _TYPE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='fields', full_name='google.protobuf.Type.fields', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneofs', full_name='google.protobuf.Type.oneofs', index=2,
|
||||
number=3, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='options', full_name='google.protobuf.Type.options', index=3,
|
||||
number=4, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='source_context', full_name='google.protobuf.Type.source_context', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='syntax', full_name='google.protobuf.Type.syntax', index=5,
|
||||
number=6, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -253,70 +253,70 @@ _FIELD = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='cardinality', full_name='google.protobuf.Field.cardinality', index=1,
|
||||
number=2, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='number', full_name='google.protobuf.Field.number', index=2,
|
||||
number=3, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='name', full_name='google.protobuf.Field.name', index=3,
|
||||
number=4, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='type_url', full_name='google.protobuf.Field.type_url', index=4,
|
||||
number=6, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_index', full_name='google.protobuf.Field.oneof_index', index=5,
|
||||
number=7, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed', full_name='google.protobuf.Field.packed', index=6,
|
||||
number=8, type=8, cpp_type=7, label=1,
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='options', full_name='google.protobuf.Field.options', index=7,
|
||||
number=9, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='json_name', full_name='google.protobuf.Field.json_name', index=8,
|
||||
number=10, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_value', full_name='google.protobuf.Field.default_value', index=9,
|
||||
number=11, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -349,35 +349,35 @@ _ENUM = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='enumvalue', full_name='google.protobuf.Enum.enumvalue', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='options', full_name='google.protobuf.Enum.options', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='source_context', full_name='google.protobuf.Enum.source_context', index=3,
|
||||
number=4, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='syntax', full_name='google.protobuf.Enum.syntax', index=4,
|
||||
number=5, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -408,21 +408,21 @@ _ENUMVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='number', full_name='google.protobuf.EnumValue.number', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='options', full_name='google.protobuf.EnumValue.options', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -453,14 +453,14 @@ _OPTION = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.Option.value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -40,7 +40,7 @@ _NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -71,14 +71,14 @@ _ARENAMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_import_no_arena_message', full_name='proto2_arena_unittest.ArenaMessage.repeated_import_no_arena_message', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -80,7 +80,7 @@ file_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
MESSAGE_OPT1_FIELD_NUMBER = 7739036
|
||||
message_opt1 = _descriptor.FieldDescriptor(
|
||||
name='message_opt1', full_name='protobuf_unittest.message_opt1', index=1,
|
||||
@@ -88,7 +88,7 @@ message_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FIELD_OPT1_FIELD_NUMBER = 7740936
|
||||
field_opt1 = _descriptor.FieldDescriptor(
|
||||
name='field_opt1', full_name='protobuf_unittest.field_opt1', index=2,
|
||||
@@ -96,7 +96,7 @@ field_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FIELD_OPT2_FIELD_NUMBER = 7753913
|
||||
field_opt2 = _descriptor.FieldDescriptor(
|
||||
name='field_opt2', full_name='protobuf_unittest.field_opt2', index=3,
|
||||
@@ -104,7 +104,7 @@ field_opt2 = _descriptor.FieldDescriptor(
|
||||
has_default_value=True, default_value=42,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
ONEOF_OPT1_FIELD_NUMBER = 7740111
|
||||
oneof_opt1 = _descriptor.FieldDescriptor(
|
||||
name='oneof_opt1', full_name='protobuf_unittest.oneof_opt1', index=4,
|
||||
@@ -112,7 +112,7 @@ oneof_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
ENUM_OPT1_FIELD_NUMBER = 7753576
|
||||
enum_opt1 = _descriptor.FieldDescriptor(
|
||||
name='enum_opt1', full_name='protobuf_unittest.enum_opt1', index=5,
|
||||
@@ -120,7 +120,7 @@ enum_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
ENUM_VALUE_OPT1_FIELD_NUMBER = 1560678
|
||||
enum_value_opt1 = _descriptor.FieldDescriptor(
|
||||
name='enum_value_opt1', full_name='protobuf_unittest.enum_value_opt1', index=6,
|
||||
@@ -128,7 +128,7 @@ enum_value_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SERVICE_OPT1_FIELD_NUMBER = 7887650
|
||||
service_opt1 = _descriptor.FieldDescriptor(
|
||||
name='service_opt1', full_name='protobuf_unittest.service_opt1', index=7,
|
||||
@@ -136,7 +136,7 @@ service_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
METHOD_OPT1_FIELD_NUMBER = 7890860
|
||||
method_opt1 = _descriptor.FieldDescriptor(
|
||||
name='method_opt1', full_name='protobuf_unittest.method_opt1', index=8,
|
||||
@@ -144,7 +144,7 @@ method_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=1,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
BOOL_OPT_FIELD_NUMBER = 7706090
|
||||
bool_opt = _descriptor.FieldDescriptor(
|
||||
name='bool_opt', full_name='protobuf_unittest.bool_opt', index=9,
|
||||
@@ -152,7 +152,7 @@ bool_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
INT32_OPT_FIELD_NUMBER = 7705709
|
||||
int32_opt = _descriptor.FieldDescriptor(
|
||||
name='int32_opt', full_name='protobuf_unittest.int32_opt', index=10,
|
||||
@@ -160,7 +160,7 @@ int32_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
INT64_OPT_FIELD_NUMBER = 7705542
|
||||
int64_opt = _descriptor.FieldDescriptor(
|
||||
name='int64_opt', full_name='protobuf_unittest.int64_opt', index=11,
|
||||
@@ -168,7 +168,7 @@ int64_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
UINT32_OPT_FIELD_NUMBER = 7704880
|
||||
uint32_opt = _descriptor.FieldDescriptor(
|
||||
name='uint32_opt', full_name='protobuf_unittest.uint32_opt', index=12,
|
||||
@@ -176,7 +176,7 @@ uint32_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
UINT64_OPT_FIELD_NUMBER = 7702367
|
||||
uint64_opt = _descriptor.FieldDescriptor(
|
||||
name='uint64_opt', full_name='protobuf_unittest.uint64_opt', index=13,
|
||||
@@ -184,7 +184,7 @@ uint64_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SINT32_OPT_FIELD_NUMBER = 7701568
|
||||
sint32_opt = _descriptor.FieldDescriptor(
|
||||
name='sint32_opt', full_name='protobuf_unittest.sint32_opt', index=14,
|
||||
@@ -192,7 +192,7 @@ sint32_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SINT64_OPT_FIELD_NUMBER = 7700863
|
||||
sint64_opt = _descriptor.FieldDescriptor(
|
||||
name='sint64_opt', full_name='protobuf_unittest.sint64_opt', index=15,
|
||||
@@ -200,7 +200,7 @@ sint64_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FIXED32_OPT_FIELD_NUMBER = 7700307
|
||||
fixed32_opt = _descriptor.FieldDescriptor(
|
||||
name='fixed32_opt', full_name='protobuf_unittest.fixed32_opt', index=16,
|
||||
@@ -208,7 +208,7 @@ fixed32_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FIXED64_OPT_FIELD_NUMBER = 7700194
|
||||
fixed64_opt = _descriptor.FieldDescriptor(
|
||||
name='fixed64_opt', full_name='protobuf_unittest.fixed64_opt', index=17,
|
||||
@@ -216,7 +216,7 @@ fixed64_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SFIXED32_OPT_FIELD_NUMBER = 7698645
|
||||
sfixed32_opt = _descriptor.FieldDescriptor(
|
||||
name='sfixed32_opt', full_name='protobuf_unittest.sfixed32_opt', index=18,
|
||||
@@ -224,7 +224,7 @@ sfixed32_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SFIXED64_OPT_FIELD_NUMBER = 7685475
|
||||
sfixed64_opt = _descriptor.FieldDescriptor(
|
||||
name='sfixed64_opt', full_name='protobuf_unittest.sfixed64_opt', index=19,
|
||||
@@ -232,7 +232,7 @@ sfixed64_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FLOAT_OPT_FIELD_NUMBER = 7675390
|
||||
float_opt = _descriptor.FieldDescriptor(
|
||||
name='float_opt', full_name='protobuf_unittest.float_opt', index=20,
|
||||
@@ -240,7 +240,7 @@ float_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
DOUBLE_OPT_FIELD_NUMBER = 7673293
|
||||
double_opt = _descriptor.FieldDescriptor(
|
||||
name='double_opt', full_name='protobuf_unittest.double_opt', index=21,
|
||||
@@ -248,7 +248,7 @@ double_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
STRING_OPT_FIELD_NUMBER = 7673285
|
||||
string_opt = _descriptor.FieldDescriptor(
|
||||
name='string_opt', full_name='protobuf_unittest.string_opt', index=22,
|
||||
@@ -256,7 +256,7 @@ string_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
BYTES_OPT_FIELD_NUMBER = 7673238
|
||||
bytes_opt = _descriptor.FieldDescriptor(
|
||||
name='bytes_opt', full_name='protobuf_unittest.bytes_opt', index=23,
|
||||
@@ -264,7 +264,7 @@ bytes_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
ENUM_OPT_FIELD_NUMBER = 7673233
|
||||
enum_opt = _descriptor.FieldDescriptor(
|
||||
name='enum_opt', full_name='protobuf_unittest.enum_opt', index=24,
|
||||
@@ -272,7 +272,7 @@ enum_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=22,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
MESSAGE_TYPE_OPT_FIELD_NUMBER = 7665967
|
||||
message_type_opt = _descriptor.FieldDescriptor(
|
||||
name='message_type_opt', full_name='protobuf_unittest.message_type_opt', index=25,
|
||||
@@ -280,7 +280,7 @@ message_type_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
QUUX_FIELD_NUMBER = 7663707
|
||||
quux = _descriptor.FieldDescriptor(
|
||||
name='quux', full_name='protobuf_unittest.quux', index=26,
|
||||
@@ -288,7 +288,7 @@ quux = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
CORGE_FIELD_NUMBER = 7663442
|
||||
corge = _descriptor.FieldDescriptor(
|
||||
name='corge', full_name='protobuf_unittest.corge', index=27,
|
||||
@@ -296,7 +296,7 @@ corge = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
GRAULT_FIELD_NUMBER = 7650927
|
||||
grault = _descriptor.FieldDescriptor(
|
||||
name='grault', full_name='protobuf_unittest.grault', index=28,
|
||||
@@ -304,7 +304,7 @@ grault = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
GARPLY_FIELD_NUMBER = 7649992
|
||||
garply = _descriptor.FieldDescriptor(
|
||||
name='garply', full_name='protobuf_unittest.garply', index=29,
|
||||
@@ -312,7 +312,7 @@ garply = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
COMPLEX_OPT1_FIELD_NUMBER = 7646756
|
||||
complex_opt1 = _descriptor.FieldDescriptor(
|
||||
name='complex_opt1', full_name='protobuf_unittest.complex_opt1', index=30,
|
||||
@@ -320,7 +320,7 @@ complex_opt1 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
COMPLEX_OPT2_FIELD_NUMBER = 7636949
|
||||
complex_opt2 = _descriptor.FieldDescriptor(
|
||||
name='complex_opt2', full_name='protobuf_unittest.complex_opt2', index=31,
|
||||
@@ -328,7 +328,7 @@ complex_opt2 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
COMPLEX_OPT3_FIELD_NUMBER = 7636463
|
||||
complex_opt3 = _descriptor.FieldDescriptor(
|
||||
name='complex_opt3', full_name='protobuf_unittest.complex_opt3', index=32,
|
||||
@@ -336,7 +336,7 @@ complex_opt3 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
COMPLEXOPT6_FIELD_NUMBER = 7595468
|
||||
complexopt6 = _descriptor.FieldDescriptor(
|
||||
name='complexopt6', full_name='protobuf_unittest.complexopt6', index=33,
|
||||
@@ -344,7 +344,7 @@ complexopt6 = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FILEOPT_FIELD_NUMBER = 15478479
|
||||
fileopt = _descriptor.FieldDescriptor(
|
||||
name='fileopt', full_name='protobuf_unittest.fileopt', index=34,
|
||||
@@ -352,7 +352,7 @@ fileopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
MSGOPT_FIELD_NUMBER = 15480088
|
||||
msgopt = _descriptor.FieldDescriptor(
|
||||
name='msgopt', full_name='protobuf_unittest.msgopt', index=35,
|
||||
@@ -360,7 +360,7 @@ msgopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
FIELDOPT_FIELD_NUMBER = 15481374
|
||||
fieldopt = _descriptor.FieldDescriptor(
|
||||
name='fieldopt', full_name='protobuf_unittest.fieldopt', index=36,
|
||||
@@ -368,7 +368,7 @@ fieldopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
ENUMOPT_FIELD_NUMBER = 15483218
|
||||
enumopt = _descriptor.FieldDescriptor(
|
||||
name='enumopt', full_name='protobuf_unittest.enumopt', index=37,
|
||||
@@ -376,7 +376,7 @@ enumopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
ENUMVALOPT_FIELD_NUMBER = 15486921
|
||||
enumvalopt = _descriptor.FieldDescriptor(
|
||||
name='enumvalopt', full_name='protobuf_unittest.enumvalopt', index=38,
|
||||
@@ -384,7 +384,7 @@ enumvalopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
SERVICEOPT_FIELD_NUMBER = 15497145
|
||||
serviceopt = _descriptor.FieldDescriptor(
|
||||
name='serviceopt', full_name='protobuf_unittest.serviceopt', index=39,
|
||||
@@ -392,7 +392,7 @@ serviceopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
METHODOPT_FIELD_NUMBER = 15512713
|
||||
methodopt = _descriptor.FieldDescriptor(
|
||||
name='methodopt', full_name='protobuf_unittest.methodopt', index=40,
|
||||
@@ -400,7 +400,7 @@ methodopt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
REQUIRED_ENUM_OPT_FIELD_NUMBER = 106161807
|
||||
required_enum_opt = _descriptor.FieldDescriptor(
|
||||
name='required_enum_opt', full_name='protobuf_unittest.required_enum_opt', index=41,
|
||||
@@ -408,7 +408,7 @@ required_enum_opt = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
_TESTMESSAGEWITHCUSTOMOPTIONS_ANENUM = _descriptor.EnumDescriptor(
|
||||
name='AnEnum',
|
||||
@@ -526,14 +526,14 @@ _TESTMESSAGEWITHCUSTOMOPTIONS = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001\301\340\303\035-\341u\n\002\000\000\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001\301\340\303\035-\341u\n\002\000\000\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_field', full_name='protobuf_unittest.TestMessageWithCustomOptions.oneof_field', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -833,28 +833,28 @@ _COMPLEXOPTIONTYPE1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='foo2', full_name='protobuf_unittest.ComplexOptionType1.foo2', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='foo3', full_name='protobuf_unittest.ComplexOptionType1.foo3', index=2,
|
||||
number=3, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='foo4', full_name='protobuf_unittest.ComplexOptionType1.foo4', index=3,
|
||||
number=4, type=5, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -885,7 +885,7 @@ _COMPLEXOPTIONTYPE2_COMPLEXOPTIONTYPE4 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -894,7 +894,7 @@ _COMPLEXOPTIONTYPE2_COMPLEXOPTIONTYPE4 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -922,28 +922,28 @@ _COMPLEXOPTIONTYPE2 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='baz', full_name='protobuf_unittest.ComplexOptionType2.baz', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='fred', full_name='protobuf_unittest.ComplexOptionType2.fred', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='barney', full_name='protobuf_unittest.ComplexOptionType2.barney', index=3,
|
||||
number=4, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -974,7 +974,7 @@ _COMPLEXOPTIONTYPE3_COMPLEXOPTIONTYPE5 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1004,14 +1004,14 @@ _COMPLEXOPTIONTYPE3 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='complexoptiontype5', full_name='protobuf_unittest.ComplexOptionType3.complexoptiontype5', index=1,
|
||||
number=2, type=10, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1042,7 +1042,7 @@ _COMPLEXOPT6 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1121,7 +1121,7 @@ _AGGREGATEMESSAGESETELEMENT = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -1130,7 +1130,7 @@ _AGGREGATEMESSAGESETELEMENT = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -1159,35 +1159,35 @@ _AGGREGATE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='s', full_name='protobuf_unittest.Aggregate.s', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='sub', full_name='protobuf_unittest.Aggregate.sub', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='file', full_name='protobuf_unittest.Aggregate.file', index=3,
|
||||
number=4, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='mset', full_name='protobuf_unittest.Aggregate.mset', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -1196,7 +1196,7 @@ _AGGREGATE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -1225,7 +1225,7 @@ _AGGREGATEMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\362\241\207;\021\022\017FieldAnnotation'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\362\241\207;\021\022\017FieldAnnotation')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1256,7 +1256,7 @@ _NESTEDOPTIONTYPE_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\301\340\303\035\352\003\000\000\000\000\000\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\301\340\303\035\352\003\000\000\000\000\000\000')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1288,7 +1288,7 @@ _NESTEDOPTIONTYPE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\310\213\312\035\355\007'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\310\213\312\035\355\007')), file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_NESTEDOPTIONTYPE_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
@@ -1318,7 +1318,7 @@ _OLDOPTIONTYPE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1350,7 +1350,7 @@ _NEWOPTIONTYPE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1815,17 +1815,9 @@ _TESTSERVICEWITHCUSTOMOPTIONS = _descriptor.ServiceDescriptor(
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\340\372\214\036\002')),
|
||||
),
|
||||
])
|
||||
_sym_db.RegisterServiceDescriptor(_TESTSERVICEWITHCUSTOMOPTIONS)
|
||||
|
||||
TestServiceWithCustomOptions = service_reflection.GeneratedServiceType('TestServiceWithCustomOptions', (_service.Service,), dict(
|
||||
DESCRIPTOR = _TESTSERVICEWITHCUSTOMOPTIONS,
|
||||
__module__ = 'google.protobuf.unittest_custom_options_pb2'
|
||||
))
|
||||
|
||||
TestServiceWithCustomOptions_Stub = service_reflection.GeneratedServiceStubType('TestServiceWithCustomOptions_Stub', (TestServiceWithCustomOptions,), dict(
|
||||
DESCRIPTOR = _TESTSERVICEWITHCUSTOMOPTIONS,
|
||||
__module__ = 'google.protobuf.unittest_custom_options_pb2'
|
||||
))
|
||||
|
||||
DESCRIPTOR.services_by_name['TestServiceWithCustomOptions'] = _TESTSERVICEWITHCUSTOMOPTIONS
|
||||
|
||||
|
||||
_AGGREGATESERVICE = _descriptor.ServiceDescriptor(
|
||||
@@ -1847,6 +1839,20 @@ _AGGREGATESERVICE = _descriptor.ServiceDescriptor(
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\312\310\226;\022\022\020MethodAnnotation')),
|
||||
),
|
||||
])
|
||||
_sym_db.RegisterServiceDescriptor(_AGGREGATESERVICE)
|
||||
|
||||
DESCRIPTOR.services_by_name['AggregateService'] = _AGGREGATESERVICE
|
||||
|
||||
TestServiceWithCustomOptions = service_reflection.GeneratedServiceType('TestServiceWithCustomOptions', (_service.Service,), dict(
|
||||
DESCRIPTOR = _TESTSERVICEWITHCUSTOMOPTIONS,
|
||||
__module__ = 'google.protobuf.unittest_custom_options_pb2'
|
||||
))
|
||||
|
||||
TestServiceWithCustomOptions_Stub = service_reflection.GeneratedServiceStubType('TestServiceWithCustomOptions_Stub', (TestServiceWithCustomOptions,), dict(
|
||||
DESCRIPTOR = _TESTSERVICEWITHCUSTOMOPTIONS,
|
||||
__module__ = 'google.protobuf.unittest_custom_options_pb2'
|
||||
))
|
||||
|
||||
|
||||
AggregateService = service_reflection.GeneratedServiceType('AggregateService', (_service.Service,), dict(
|
||||
DESCRIPTOR = _AGGREGATESERVICE,
|
||||
|
||||
@@ -103,7 +103,7 @@ _IMPORTMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -38,7 +38,7 @@ _PUBLICIMPORTMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -40,7 +40,7 @@ _TESTMESSAGESETCONTAINER = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -71,7 +71,7 @@ _TESTMESSAGESETEXTENSION1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -80,7 +80,7 @@ _TESTMESSAGESETEXTENSION1 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -109,7 +109,7 @@ _TESTMESSAGESETEXTENSION2 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -118,7 +118,7 @@ _TESTMESSAGESETEXTENSION2 = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
@@ -147,14 +147,14 @@ _RAWMESSAGESET_ITEM = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='message', full_name='protobuf_unittest.RawMessageSet.Item.message', index=1,
|
||||
number=3, type=12, cpp_type=9, label=2,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -184,7 +184,7 @@ _RAWMESSAGESET = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -62,7 +62,7 @@ _TESTMESSAGESETWIREFORMATCONTAINER = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -38,7 +38,7 @@ _IMPORTNOARENANESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -106,7 +106,7 @@ _TESTALLTYPES_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -136,7 +136,7 @@ _TESTALLTYPES_OPTIONALGROUP = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -166,7 +166,7 @@ _TESTALLTYPES_REPEATEDGROUP = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -196,532 +196,532 @@ _TESTALLTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_int64', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_int64', index=1,
|
||||
number=2, type=3, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_uint32', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_uint32', index=2,
|
||||
number=3, type=13, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_uint64', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_uint64', index=3,
|
||||
number=4, type=4, cpp_type=4, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sint32', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_sint32', index=4,
|
||||
number=5, type=17, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sint64', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_sint64', index=5,
|
||||
number=6, type=18, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_fixed32', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_fixed32', index=6,
|
||||
number=7, type=7, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_fixed64', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_fixed64', index=7,
|
||||
number=8, type=6, cpp_type=4, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sfixed32', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_sfixed32', index=8,
|
||||
number=9, type=15, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sfixed64', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_sfixed64', index=9,
|
||||
number=10, type=16, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_float', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_float', index=10,
|
||||
number=11, type=2, cpp_type=6, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_double', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_double', index=11,
|
||||
number=12, type=1, cpp_type=5, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_bool', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_bool', index=12,
|
||||
number=13, type=8, cpp_type=7, label=1,
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_string', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_string', index=13,
|
||||
number=14, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_bytes', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_bytes', index=14,
|
||||
number=15, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optionalgroup', full_name='protobuf_unittest_no_arena.TestAllTypes.optionalgroup', index=15,
|
||||
number=16, type=10, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_message', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_nested_message', index=16,
|
||||
number=18, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_foreign_message', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_foreign_message', index=17,
|
||||
number=19, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_import_message', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_import_message', index=18,
|
||||
number=20, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_nested_enum', index=19,
|
||||
number=21, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=1,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_foreign_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_foreign_enum', index=20,
|
||||
number=22, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=4,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_import_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_import_enum', index=21,
|
||||
number=23, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=7,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_string_piece', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_string_piece', index=22,
|
||||
number=24, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_cord', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_cord', index=23,
|
||||
number=25, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_public_import_message', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_public_import_message', index=24,
|
||||
number=26, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_message', full_name='protobuf_unittest_no_arena.TestAllTypes.optional_message', index=25,
|
||||
number=27, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int32', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_int32', index=26,
|
||||
number=31, type=5, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_int64', index=27,
|
||||
number=32, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_uint32', index=28,
|
||||
number=33, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_uint64', index=29,
|
||||
number=34, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint32', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_sint32', index=30,
|
||||
number=35, type=17, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint64', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_sint64', index=31,
|
||||
number=36, type=18, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed32', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_fixed32', index=32,
|
||||
number=37, type=7, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed64', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_fixed64', index=33,
|
||||
number=38, type=6, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed32', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_sfixed32', index=34,
|
||||
number=39, type=15, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed64', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_sfixed64', index=35,
|
||||
number=40, type=16, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_float', index=36,
|
||||
number=41, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_double', index=37,
|
||||
number=42, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_bool', index=38,
|
||||
number=43, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_string', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_string', index=39,
|
||||
number=44, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bytes', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_bytes', index=40,
|
||||
number=45, type=12, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeatedgroup', full_name='protobuf_unittest_no_arena.TestAllTypes.repeatedgroup', index=41,
|
||||
number=46, type=10, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_message', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_nested_message', index=42,
|
||||
number=48, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_foreign_message', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_foreign_message', index=43,
|
||||
number=49, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_import_message', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_import_message', index=44,
|
||||
number=50, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_nested_enum', index=45,
|
||||
number=51, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_foreign_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_foreign_enum', index=46,
|
||||
number=52, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_import_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_import_enum', index=47,
|
||||
number=53, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_string_piece', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_string_piece', index=48,
|
||||
number=54, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_cord', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_cord', index=49,
|
||||
number=55, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_lazy_message', full_name='protobuf_unittest_no_arena.TestAllTypes.repeated_lazy_message', index=50,
|
||||
number=57, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_int32', full_name='protobuf_unittest_no_arena.TestAllTypes.default_int32', index=51,
|
||||
number=61, type=5, cpp_type=1, label=1,
|
||||
has_default_value=True, default_value=41,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_int64', full_name='protobuf_unittest_no_arena.TestAllTypes.default_int64', index=52,
|
||||
number=62, type=3, cpp_type=2, label=1,
|
||||
has_default_value=True, default_value=42,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_uint32', full_name='protobuf_unittest_no_arena.TestAllTypes.default_uint32', index=53,
|
||||
number=63, type=13, cpp_type=3, label=1,
|
||||
has_default_value=True, default_value=43,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_uint64', full_name='protobuf_unittest_no_arena.TestAllTypes.default_uint64', index=54,
|
||||
number=64, type=4, cpp_type=4, label=1,
|
||||
has_default_value=True, default_value=44,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_sint32', full_name='protobuf_unittest_no_arena.TestAllTypes.default_sint32', index=55,
|
||||
number=65, type=17, cpp_type=1, label=1,
|
||||
has_default_value=True, default_value=-45,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_sint64', full_name='protobuf_unittest_no_arena.TestAllTypes.default_sint64', index=56,
|
||||
number=66, type=18, cpp_type=2, label=1,
|
||||
has_default_value=True, default_value=46,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_fixed32', full_name='protobuf_unittest_no_arena.TestAllTypes.default_fixed32', index=57,
|
||||
number=67, type=7, cpp_type=3, label=1,
|
||||
has_default_value=True, default_value=47,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_fixed64', full_name='protobuf_unittest_no_arena.TestAllTypes.default_fixed64', index=58,
|
||||
number=68, type=6, cpp_type=4, label=1,
|
||||
has_default_value=True, default_value=48,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_sfixed32', full_name='protobuf_unittest_no_arena.TestAllTypes.default_sfixed32', index=59,
|
||||
number=69, type=15, cpp_type=1, label=1,
|
||||
has_default_value=True, default_value=49,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_sfixed64', full_name='protobuf_unittest_no_arena.TestAllTypes.default_sfixed64', index=60,
|
||||
number=70, type=16, cpp_type=2, label=1,
|
||||
has_default_value=True, default_value=-50,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_float', full_name='protobuf_unittest_no_arena.TestAllTypes.default_float', index=61,
|
||||
number=71, type=2, cpp_type=6, label=1,
|
||||
has_default_value=True, default_value=float(51.5),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_double', full_name='protobuf_unittest_no_arena.TestAllTypes.default_double', index=62,
|
||||
number=72, type=1, cpp_type=5, label=1,
|
||||
has_default_value=True, default_value=float(52000),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_bool', full_name='protobuf_unittest_no_arena.TestAllTypes.default_bool', index=63,
|
||||
number=73, type=8, cpp_type=7, label=1,
|
||||
has_default_value=True, default_value=True,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_string', full_name='protobuf_unittest_no_arena.TestAllTypes.default_string', index=64,
|
||||
number=74, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("hello").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_bytes', full_name='protobuf_unittest_no_arena.TestAllTypes.default_bytes', index=65,
|
||||
number=75, type=12, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("world"),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_nested_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.default_nested_enum', index=66,
|
||||
number=81, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=2,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_foreign_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.default_foreign_enum', index=67,
|
||||
number=82, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=5,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_import_enum', full_name='protobuf_unittest_no_arena.TestAllTypes.default_import_enum', index=68,
|
||||
number=83, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=8,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_string_piece', full_name='protobuf_unittest_no_arena.TestAllTypes.default_string_piece', index=69,
|
||||
number=84, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("abc").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='default_cord', full_name='protobuf_unittest_no_arena.TestAllTypes.default_cord', index=70,
|
||||
number=85, type=9, cpp_type=9, label=1,
|
||||
has_default_value=True, default_value=_b("123").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_uint32', full_name='protobuf_unittest_no_arena.TestAllTypes.oneof_uint32', index=71,
|
||||
number=111, type=13, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_nested_message', full_name='protobuf_unittest_no_arena.TestAllTypes.oneof_nested_message', index=72,
|
||||
number=112, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_string', full_name='protobuf_unittest_no_arena.TestAllTypes.oneof_string', index=73,
|
||||
number=113, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_bytes', full_name='protobuf_unittest_no_arena.TestAllTypes.oneof_bytes', index=74,
|
||||
number=114, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='lazy_oneof_nested_message', full_name='protobuf_unittest_no_arena.TestAllTypes.lazy_oneof_nested_message', index=75,
|
||||
number=115, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -756,7 +756,7 @@ _FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -787,7 +787,7 @@ _TESTNOARENAMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -51,7 +51,7 @@ test_extension = _descriptor.FieldDescriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
options=None)
|
||||
options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTMESSAGE = _descriptor.Descriptor(
|
||||
@@ -67,7 +67,7 @@ _TESTMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -98,4 +98,28 @@ _sym_db.RegisterMessage(TestMessage)
|
||||
|
||||
TestMessage.RegisterExtension(test_extension)
|
||||
|
||||
|
||||
_TESTSERVICE = _descriptor.ServiceDescriptor(
|
||||
name='TestService',
|
||||
full_name='google.protobuf.no_generic_services_test.TestService',
|
||||
file=DESCRIPTOR,
|
||||
index=0,
|
||||
options=None,
|
||||
serialized_start=155,
|
||||
serialized_end=285,
|
||||
methods=[
|
||||
_descriptor.MethodDescriptor(
|
||||
name='Foo',
|
||||
full_name='google.protobuf.no_generic_services_test.TestService.Foo',
|
||||
index=0,
|
||||
containing_service=None,
|
||||
input_type=_TESTMESSAGE,
|
||||
output_type=_TESTMESSAGE,
|
||||
options=None,
|
||||
),
|
||||
])
|
||||
_sym_db.RegisterServiceDescriptor(_TESTSERVICE)
|
||||
|
||||
DESCRIPTOR.services_by_name['TestService'] = _TESTSERVICE
|
||||
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
File diff suppressed because it is too large.
Load diff
@@ -25,7 +25,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_proto3_arena.proto',
|
||||
package='proto3_arena_unittest',
|
||||
syntax='proto3',
|
||||
serialized_pb=_b('\n+google/protobuf/unittest_proto3_arena.proto\x12\x15proto3_arena_unittest\x1a%google/protobuf/unittest_import.proto\"\xc9\x11\n\x0cTestAllTypes\x12\x16\n\x0eoptional_int32\x18\x01 \x01(\x05\x12\x16\n\x0eoptional_int64\x18\x02 \x01(\x03\x12\x17\n\x0foptional_uint32\x18\x03 \x01(\r\x12\x17\n\x0foptional_uint64\x18\x04 \x01(\x04\x12\x17\n\x0foptional_sint32\x18\x05 \x01(\x11\x12\x17\n\x0foptional_sint64\x18\x06 \x01(\x12\x12\x18\n\x10optional_fixed32\x18\x07 \x01(\x07\x12\x18\n\x10optional_fixed64\x18\x08 \x01(\x06\x12\x19\n\x11optional_sfixed32\x18\t \x01(\x0f\x12\x19\n\x11optional_sfixed64\x18\n \x01(\x10\x12\x16\n\x0eoptional_float\x18\x0b \x01(\x02\x12\x17\n\x0foptional_double\x18\x0c \x01(\x01\x12\x15\n\roptional_bool\x18\r \x01(\x08\x12\x17\n\x0foptional_string\x18\x0e \x01(\t\x12\x16\n\x0eoptional_bytes\x18\x0f \x01(\x0c\x12R\n\x17optional_nested_message\x18\x12 \x01(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessage\x12G\n\x18optional_foreign_message\x18\x13 \x01(\x0b\x32%.proto3_arena_unittest.ForeignMessage\x12H\n\x17optional_import_message\x18\x14 \x01(\x0b\x32\'.protobuf_unittest_import.ImportMessage\x12L\n\x14optional_nested_enum\x18\x15 \x01(\x0e\x32..proto3_arena_unittest.TestAllTypes.NestedEnum\x12\x41\n\x15optional_foreign_enum\x18\x16 \x01(\x0e\x32\".proto3_arena_unittest.ForeignEnum\x12!\n\x15optional_string_piece\x18\x18 \x01(\tB\x02\x08\x02\x12\x19\n\roptional_cord\x18\x19 \x01(\tB\x02\x08\x01\x12U\n\x1eoptional_public_import_message\x18\x1a \x01(\x0b\x32-.protobuf_unittest_import.PublicImportMessage\x12T\n\x15optional_lazy_message\x18\x1b \x01(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessageB\x02(\x01\x12Q\n\x1coptional_lazy_import_message\x18s \x01(\x0b\x32\'.protobuf_unittest_import.ImportMessageB\x02(\x01\x12\x16\n\x0erepeated_int32\x18\x1f \x03(\x05\x12\x16\n\x0erepeated_int64\x18 \x03(\x03\x12\x17\n\x0frepeated_uint32\x18! \x03(\r\x12\x17\n\x0frepeated_uint64\x18\" \x03(\x04\x12\x17\n\x0frepeated_sint32\x18# \x03(\x11\x12\x17\n\x0frepeated_sint64\x18$ \x03(\x12\x12\x18\n\x10repeated_fixed32\x18% \x03(\x07\x12\x18\n\x10repeated_fixed64\x18& \x03(\x06\x12\x19\n\x11repeated_sfixed32\x18\' \x03(\x0f\x12\x19\n\x11repeated_sfixed64\x18( \x03(\x10\x12\x16\n\x0erepeated_float\x18) \x03(\x02\x12\x17\n\x0frepeated_double\x18* \x03(\x01\x12\x15\n\rrepeated_bool\x18+ \x03(\x08\x12\x17\n\x0frepeated_string\x18, \x03(\t\x12\x16\n\x0erepeated_bytes\x18- \x03(\x0c\x12R\n\x17repeated_nested_message\x18\x30 \x03(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessage\x12G\n\x18repeated_foreign_message\x18\x31 \x03(\x0b\x32%.proto3_arena_unittest.ForeignMessage\x12H\n\x17repeated_import_message\x18\x32 \x03(\x0b\x32\'.protobuf_unittest_import.ImportMessage\x12L\n\x14repeated_nested_enum\x18\x33 \x03(\x0e\x32..proto3_arena_unittest.TestAllTypes.NestedEnum\x12\x41\n\x15repeated_foreign_enum\x18\x34 \x03(\x0e\x32\".proto3_arena_unittest.ForeignEnum\x12!\n\x15repeated_string_piece\x18\x36 \x03(\tB\x02\x08\x02\x12\x19\n\rrepeated_cord\x18\x37 \x03(\tB\x02\x08\x01\x12T\n\x15repeated_lazy_message\x18\x39 \x03(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessageB\x02(\x01\x12\x16\n\x0coneof_uint32\x18o \x01(\rH\x00\x12Q\n\x14oneof_nested_message\x18p \x01(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessageH\x00\x12\x16\n\x0coneof_string\x18q \x01(\tH\x00\x12\x15\n\x0boneof_bytes\x18r \x01(\x0cH\x00\x1a\x1b\n\rNestedMessage\x12\n\n\x02\x62\x62\x18\x01 \x01(\x05\"C\n\nNestedEnum\x12\x08\n\x04ZERO\x10\x00\x12\x07\n\x03\x46OO\x10\x01\x12\x07\n\x03\x42\x41R\x10\x02\x12\x07\n\x03\x42\x41Z\x10\x03\x12\x10\n\x03NEG\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x42\r\n\x0boneof_field\"\xae\x03\n\x0fTestPackedTypes\x12\x18\n\x0cpacked_int32\x18Z \x03(\x05\x42\x02\x10\x01\x12\x18\n\x0cpacked_int64\x18[ \x03(\x03\x42\x02\x10\x01\x12\x19\n\rpacked_uint32\x18\\ \x03(\rB\x02\x10\x01\x12\x19\n\rpacked_uint64\x18] \x03(\x04\x42\x02\x10\x01\x12\x19\n\rpacked_sint32\x18^ \x03(\x11\x42\x02\x10\x01\x12\x19\n\rpacked_sint64\x18_ \x03(\x12\x42\x02\x10\x01\x12\x1a\n\x0epacked_fixed32\x18` \x03(\x07\x42\x02\x10\x01\x12\x1a\n\x0epacked_fixed64\x18\x61 \x03(\x06\x42\x02\x10\x01\x12\x1b\n\x0fpacked_sfixed32\x18\x62 \x03(\x0f\x42\x02\x10\x01\x12\x1b\n\x0fpacked_sfixed64\x18\x63 \x03(\x10\x42\x02\x10\x01\x12\x18\n\x0cpacked_float\x18\x64 \x03(\x02\x42\x02\x10\x01\x12\x19\n\rpacked_double\x18\x65 \x03(\x01\x42\x02\x10\x01\x12\x17\n\x0bpacked_bool\x18\x66 \x03(\x08\x42\x02\x10\x01\x12;\n\x0bpacked_enum\x18g \x03(\x0e\x32\".proto3_arena_unittest.ForeignEnumB\x02\x10\x01\"\xdf\x03\n\x11TestUnpackedTypes\x12\x1a\n\x0erepeated_int32\x18\x01 \x03(\x05\x42\x02\x10\x00\x12\x1a\n\x0erepeated_int64\x18\x02 \x03(\x03\x42\x02\x10\x00\x12\x1b\n\x0frepeated_uint32\x18\x03 \x03(\rB\x02\x10\x00\x12\x1b\n\x0frepeated_uint64\x18\x04 \x03(\x04\x42\x02\x10\x00\x12\x1b\n\x0frepeated_sint32\x18\x05 \x03(\x11\x42\x02\x10\x00\x12\x1b\n\x0frepeated_sint64\x18\x06 \x03(\x12\x42\x02\x10\x00\x12\x1Line truncated
|
||||
serialized_pb=_b('\n+google/protobuf/unittest_proto3_arena.proto\x12\x15proto3_arena_unittest\x1a%google/protobuf/unittest_import.proto\"\xc9\x11\n\x0cTestAllTypes\x12\x16\n\x0eoptional_int32\x18\x01 \x01(\x05\x12\x16\n\x0eoptional_int64\x18\x02 \x01(\x03\x12\x17\n\x0foptional_uint32\x18\x03 \x01(\r\x12\x17\n\x0foptional_uint64\x18\x04 \x01(\x04\x12\x17\n\x0foptional_sint32\x18\x05 \x01(\x11\x12\x17\n\x0foptional_sint64\x18\x06 \x01(\x12\x12\x18\n\x10optional_fixed32\x18\x07 \x01(\x07\x12\x18\n\x10optional_fixed64\x18\x08 \x01(\x06\x12\x19\n\x11optional_sfixed32\x18\t \x01(\x0f\x12\x19\n\x11optional_sfixed64\x18\n \x01(\x10\x12\x16\n\x0eoptional_float\x18\x0b \x01(\x02\x12\x17\n\x0foptional_double\x18\x0c \x01(\x01\x12\x15\n\roptional_bool\x18\r \x01(\x08\x12\x17\n\x0foptional_string\x18\x0e \x01(\t\x12\x16\n\x0eoptional_bytes\x18\x0f \x01(\x0c\x12R\n\x17optional_nested_message\x18\x12 \x01(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessage\x12G\n\x18optional_foreign_message\x18\x13 \x01(\x0b\x32%.proto3_arena_unittest.ForeignMessage\x12H\n\x17optional_import_message\x18\x14 \x01(\x0b\x32\'.protobuf_unittest_import.ImportMessage\x12L\n\x14optional_nested_enum\x18\x15 \x01(\x0e\x32..proto3_arena_unittest.TestAllTypes.NestedEnum\x12\x41\n\x15optional_foreign_enum\x18\x16 \x01(\x0e\x32\".proto3_arena_unittest.ForeignEnum\x12!\n\x15optional_string_piece\x18\x18 \x01(\tB\x02\x08\x02\x12\x19\n\roptional_cord\x18\x19 \x01(\tB\x02\x08\x01\x12U\n\x1eoptional_public_import_message\x18\x1a \x01(\x0b\x32-.protobuf_unittest_import.PublicImportMessage\x12T\n\x15optional_lazy_message\x18\x1b \x01(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessageB\x02(\x01\x12Q\n\x1coptional_lazy_import_message\x18s \x01(\x0b\x32\'.protobuf_unittest_import.ImportMessageB\x02(\x01\x12\x16\n\x0erepeated_int32\x18\x1f \x03(\x05\x12\x16\n\x0erepeated_int64\x18 \x03(\x03\x12\x17\n\x0frepeated_uint32\x18! \x03(\r\x12\x17\n\x0frepeated_uint64\x18\" \x03(\x04\x12\x17\n\x0frepeated_sint32\x18# \x03(\x11\x12\x17\n\x0frepeated_sint64\x18$ \x03(\x12\x12\x18\n\x10repeated_fixed32\x18% \x03(\x07\x12\x18\n\x10repeated_fixed64\x18& \x03(\x06\x12\x19\n\x11repeated_sfixed32\x18\' \x03(\x0f\x12\x19\n\x11repeated_sfixed64\x18( \x03(\x10\x12\x16\n\x0erepeated_float\x18) \x03(\x02\x12\x17\n\x0frepeated_double\x18* \x03(\x01\x12\x15\n\rrepeated_bool\x18+ \x03(\x08\x12\x17\n\x0frepeated_string\x18, \x03(\t\x12\x16\n\x0erepeated_bytes\x18- \x03(\x0c\x12R\n\x17repeated_nested_message\x18\x30 \x03(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessage\x12G\n\x18repeated_foreign_message\x18\x31 \x03(\x0b\x32%.proto3_arena_unittest.ForeignMessage\x12H\n\x17repeated_import_message\x18\x32 \x03(\x0b\x32\'.protobuf_unittest_import.ImportMessage\x12L\n\x14repeated_nested_enum\x18\x33 \x03(\x0e\x32..proto3_arena_unittest.TestAllTypes.NestedEnum\x12\x41\n\x15repeated_foreign_enum\x18\x34 \x03(\x0e\x32\".proto3_arena_unittest.ForeignEnum\x12!\n\x15repeated_string_piece\x18\x36 \x03(\tB\x02\x08\x02\x12\x19\n\rrepeated_cord\x18\x37 \x03(\tB\x02\x08\x01\x12T\n\x15repeated_lazy_message\x18\x39 \x03(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessageB\x02(\x01\x12\x16\n\x0coneof_uint32\x18o \x01(\rH\x00\x12Q\n\x14oneof_nested_message\x18p \x01(\x0b\x32\x31.proto3_arena_unittest.TestAllTypes.NestedMessageH\x00\x12\x16\n\x0coneof_string\x18q \x01(\tH\x00\x12\x15\n\x0boneof_bytes\x18r \x01(\x0cH\x00\x1a\x1b\n\rNestedMessage\x12\n\n\x02\x62\x62\x18\x01 \x01(\x05\"C\n\nNestedEnum\x12\x08\n\x04ZERO\x10\x00\x12\x07\n\x03\x46OO\x10\x01\x12\x07\n\x03\x42\x41R\x10\x02\x12\x07\n\x03\x42\x41Z\x10\x03\x12\x10\n\x03NEG\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x42\r\n\x0boneof_field\"\xae\x03\n\x0fTestPackedTypes\x12\x18\n\x0cpacked_int32\x18Z \x03(\x05\x42\x02\x10\x01\x12\x18\n\x0cpacked_int64\x18[ \x03(\x03\x42\x02\x10\x01\x12\x19\n\rpacked_uint32\x18\\ \x03(\rB\x02\x10\x01\x12\x19\n\rpacked_uint64\x18] \x03(\x04\x42\x02\x10\x01\x12\x19\n\rpacked_sint32\x18^ \x03(\x11\x42\x02\x10\x01\x12\x19\n\rpacked_sint64\x18_ \x03(\x12\x42\x02\x10\x01\x12\x1a\n\x0epacked_fixed32\x18` \x03(\x07\x42\x02\x10\x01\x12\x1a\n\x0epacked_fixed64\x18\x61 \x03(\x06\x42\x02\x10\x01\x12\x1b\n\x0fpacked_sfixed32\x18\x62 \x03(\x0f\x42\x02\x10\x01\x12\x1b\n\x0fpacked_sfixed64\x18\x63 \x03(\x10\x42\x02\x10\x01\x12\x18\n\x0cpacked_float\x18\x64 \x03(\x02\x42\x02\x10\x01\x12\x19\n\rpacked_double\x18\x65 \x03(\x01\x42\x02\x10\x01\x12\x17\n\x0bpacked_bool\x18\x66 \x03(\x08\x42\x02\x10\x01\x12;\n\x0bpacked_enum\x18g \x03(\x0e\x32\".proto3_arena_unittest.ForeignEnumB\x02\x10\x01\"\xdf\x03\n\x11TestUnpackedTypes\x12\x1a\n\x0erepeated_int32\x18\x01 \x03(\x05\x42\x02\x10\x00\x12\x1a\n\x0erepeated_int64\x18\x02 \x03(\x03\x42\x02\x10\x00\x12\x1b\n\x0frepeated_uint32\x18\x03 \x03(\rB\x02\x10\x00\x12\x1b\n\x0frepeated_uint64\x18\x04 \x03(\x04\x42\x02\x10\x00\x12\x1b\n\x0frepeated_sint32\x18\x05 \x03(\x11\x42\x02\x10\x00\x12\x1b\n\x0frepeated_sint64\x18\x06 \x03(\x12\x42\x02\x10\x00\x12\x1Line truncated
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_unittest__import__pb2.DESCRIPTOR,])
|
||||
|
||||
@@ -54,8 +54,8 @@ _FOREIGNENUM = _descriptor.EnumDescriptor(
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_start=3460,
|
||||
serialized_end=3542,
|
||||
serialized_start=3527,
|
||||
serialized_end=3609,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_FOREIGNENUM)
|
||||
|
||||
@@ -114,7 +114,7 @@ _TESTALLTYPES_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -144,364 +144,364 @@ _TESTALLTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_int64', full_name='proto3_arena_unittest.TestAllTypes.optional_int64', index=1,
|
||||
number=2, type=3, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_uint32', full_name='proto3_arena_unittest.TestAllTypes.optional_uint32', index=2,
|
||||
number=3, type=13, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_uint64', full_name='proto3_arena_unittest.TestAllTypes.optional_uint64', index=3,
|
||||
number=4, type=4, cpp_type=4, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sint32', full_name='proto3_arena_unittest.TestAllTypes.optional_sint32', index=4,
|
||||
number=5, type=17, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sint64', full_name='proto3_arena_unittest.TestAllTypes.optional_sint64', index=5,
|
||||
number=6, type=18, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_fixed32', full_name='proto3_arena_unittest.TestAllTypes.optional_fixed32', index=6,
|
||||
number=7, type=7, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_fixed64', full_name='proto3_arena_unittest.TestAllTypes.optional_fixed64', index=7,
|
||||
number=8, type=6, cpp_type=4, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sfixed32', full_name='proto3_arena_unittest.TestAllTypes.optional_sfixed32', index=8,
|
||||
number=9, type=15, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_sfixed64', full_name='proto3_arena_unittest.TestAllTypes.optional_sfixed64', index=9,
|
||||
number=10, type=16, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_float', full_name='proto3_arena_unittest.TestAllTypes.optional_float', index=10,
|
||||
number=11, type=2, cpp_type=6, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_double', full_name='proto3_arena_unittest.TestAllTypes.optional_double', index=11,
|
||||
number=12, type=1, cpp_type=5, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_bool', full_name='proto3_arena_unittest.TestAllTypes.optional_bool', index=12,
|
||||
number=13, type=8, cpp_type=7, label=1,
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_string', full_name='proto3_arena_unittest.TestAllTypes.optional_string', index=13,
|
||||
number=14, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_bytes', full_name='proto3_arena_unittest.TestAllTypes.optional_bytes', index=14,
|
||||
number=15, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_message', full_name='proto3_arena_unittest.TestAllTypes.optional_nested_message', index=15,
|
||||
number=18, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_foreign_message', full_name='proto3_arena_unittest.TestAllTypes.optional_foreign_message', index=16,
|
||||
number=19, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_import_message', full_name='proto3_arena_unittest.TestAllTypes.optional_import_message', index=17,
|
||||
number=20, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_enum', full_name='proto3_arena_unittest.TestAllTypes.optional_nested_enum', index=18,
|
||||
number=21, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_foreign_enum', full_name='proto3_arena_unittest.TestAllTypes.optional_foreign_enum', index=19,
|
||||
number=22, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_string_piece', full_name='proto3_arena_unittest.TestAllTypes.optional_string_piece', index=20,
|
||||
number=24, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_cord', full_name='proto3_arena_unittest.TestAllTypes.optional_cord', index=21,
|
||||
number=25, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_public_import_message', full_name='proto3_arena_unittest.TestAllTypes.optional_public_import_message', index=22,
|
||||
number=26, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_lazy_message', full_name='proto3_arena_unittest.TestAllTypes.optional_lazy_message', index=23,
|
||||
number=27, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_lazy_import_message', full_name='proto3_arena_unittest.TestAllTypes.optional_lazy_import_message', index=24,
|
||||
number=115, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int32', full_name='proto3_arena_unittest.TestAllTypes.repeated_int32', index=25,
|
||||
number=31, type=5, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64', full_name='proto3_arena_unittest.TestAllTypes.repeated_int64', index=26,
|
||||
number=32, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32', full_name='proto3_arena_unittest.TestAllTypes.repeated_uint32', index=27,
|
||||
number=33, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64', full_name='proto3_arena_unittest.TestAllTypes.repeated_uint64', index=28,
|
||||
number=34, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint32', full_name='proto3_arena_unittest.TestAllTypes.repeated_sint32', index=29,
|
||||
number=35, type=17, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint64', full_name='proto3_arena_unittest.TestAllTypes.repeated_sint64', index=30,
|
||||
number=36, type=18, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed32', full_name='proto3_arena_unittest.TestAllTypes.repeated_fixed32', index=31,
|
||||
number=37, type=7, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed64', full_name='proto3_arena_unittest.TestAllTypes.repeated_fixed64', index=32,
|
||||
number=38, type=6, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed32', full_name='proto3_arena_unittest.TestAllTypes.repeated_sfixed32', index=33,
|
||||
number=39, type=15, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed64', full_name='proto3_arena_unittest.TestAllTypes.repeated_sfixed64', index=34,
|
||||
number=40, type=16, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float', full_name='proto3_arena_unittest.TestAllTypes.repeated_float', index=35,
|
||||
number=41, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double', full_name='proto3_arena_unittest.TestAllTypes.repeated_double', index=36,
|
||||
number=42, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool', full_name='proto3_arena_unittest.TestAllTypes.repeated_bool', index=37,
|
||||
number=43, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_string', full_name='proto3_arena_unittest.TestAllTypes.repeated_string', index=38,
|
||||
number=44, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bytes', full_name='proto3_arena_unittest.TestAllTypes.repeated_bytes', index=39,
|
||||
number=45, type=12, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_message', full_name='proto3_arena_unittest.TestAllTypes.repeated_nested_message', index=40,
|
||||
number=48, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_foreign_message', full_name='proto3_arena_unittest.TestAllTypes.repeated_foreign_message', index=41,
|
||||
number=49, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_import_message', full_name='proto3_arena_unittest.TestAllTypes.repeated_import_message', index=42,
|
||||
number=50, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='proto3_arena_unittest.TestAllTypes.repeated_nested_enum', index=43,
|
||||
number=51, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_foreign_enum', full_name='proto3_arena_unittest.TestAllTypes.repeated_foreign_enum', index=44,
|
||||
number=52, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_string_piece', full_name='proto3_arena_unittest.TestAllTypes.repeated_string_piece', index=45,
|
||||
number=54, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_cord', full_name='proto3_arena_unittest.TestAllTypes.repeated_cord', index=46,
|
||||
number=55, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_lazy_message', full_name='proto3_arena_unittest.TestAllTypes.repeated_lazy_message', index=47,
|
||||
number=57, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_uint32', full_name='proto3_arena_unittest.TestAllTypes.oneof_uint32', index=48,
|
||||
number=111, type=13, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_nested_message', full_name='proto3_arena_unittest.TestAllTypes.oneof_nested_message', index=49,
|
||||
number=112, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_string', full_name='proto3_arena_unittest.TestAllTypes.oneof_string', index=50,
|
||||
number=113, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_bytes', full_name='proto3_arena_unittest.TestAllTypes.oneof_bytes', index=51,
|
||||
number=114, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -536,98 +536,98 @@ _TESTPACKEDTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_int64', full_name='proto3_arena_unittest.TestPackedTypes.packed_int64', index=1,
|
||||
number=91, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_uint32', full_name='proto3_arena_unittest.TestPackedTypes.packed_uint32', index=2,
|
||||
number=92, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_uint64', full_name='proto3_arena_unittest.TestPackedTypes.packed_uint64', index=3,
|
||||
number=93, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_sint32', full_name='proto3_arena_unittest.TestPackedTypes.packed_sint32', index=4,
|
||||
number=94, type=17, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_sint64', full_name='proto3_arena_unittest.TestPackedTypes.packed_sint64', index=5,
|
||||
number=95, type=18, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_fixed32', full_name='proto3_arena_unittest.TestPackedTypes.packed_fixed32', index=6,
|
||||
number=96, type=7, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_fixed64', full_name='proto3_arena_unittest.TestPackedTypes.packed_fixed64', index=7,
|
||||
number=97, type=6, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_sfixed32', full_name='proto3_arena_unittest.TestPackedTypes.packed_sfixed32', index=8,
|
||||
number=98, type=15, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_sfixed64', full_name='proto3_arena_unittest.TestPackedTypes.packed_sfixed64', index=9,
|
||||
number=99, type=16, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_float', full_name='proto3_arena_unittest.TestPackedTypes.packed_float', index=10,
|
||||
number=100, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_double', full_name='proto3_arena_unittest.TestPackedTypes.packed_double', index=11,
|
||||
number=101, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_bool', full_name='proto3_arena_unittest.TestPackedTypes.packed_bool', index=12,
|
||||
number=102, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='packed_enum', full_name='proto3_arena_unittest.TestPackedTypes.packed_enum', index=13,
|
||||
number=103, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -658,98 +658,98 @@ _TESTUNPACKEDTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_int64', index=1,
|
||||
number=2, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_uint32', index=2,
|
||||
number=3, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_uint64', index=3,
|
||||
number=4, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint32', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_sint32', index=4,
|
||||
number=5, type=17, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sint64', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_sint64', index=5,
|
||||
number=6, type=18, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed32', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_fixed32', index=6,
|
||||
number=7, type=7, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_fixed64', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_fixed64', index=7,
|
||||
number=8, type=6, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed32', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_sfixed32', index=8,
|
||||
number=9, type=15, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_sfixed64', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_sfixed64', index=9,
|
||||
number=10, type=16, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_float', index=10,
|
||||
number=11, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_double', index=11,
|
||||
number=12, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_bool', index=12,
|
||||
number=13, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_enum', full_name='proto3_arena_unittest.TestUnpackedTypes.repeated_nested_enum', index=13,
|
||||
number=14, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))),
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000')), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -780,14 +780,21 @@ _NESTEDTESTALLTYPES = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='payload', full_name='proto3_arena_unittest.NestedTestAllTypes.payload', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_child', full_name='proto3_arena_unittest.NestedTestAllTypes.repeated_child', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -801,7 +808,7 @@ _NESTEDTESTALLTYPES = _descriptor.Descriptor(
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=3277,
|
||||
serialized_end=3409,
|
||||
serialized_end=3476,
|
||||
)
|
||||
|
||||
|
||||
@@ -818,7 +825,7 @@ _FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -831,8 +838,8 @@ _FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=3411,
|
||||
serialized_end=3438,
|
||||
serialized_start=3478,
|
||||
serialized_end=3505,
|
||||
)
|
||||
|
||||
|
||||
@@ -855,8 +862,8 @@ _TESTEMPTYMESSAGE = _descriptor.Descriptor(
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=3440,
|
||||
serialized_end=3458,
|
||||
serialized_start=3507,
|
||||
serialized_end=3525,
|
||||
)
|
||||
|
||||
_TESTALLTYPES_NESTEDMESSAGE.containing_type = _TESTALLTYPES
|
||||
@@ -892,6 +899,7 @@ _TESTPACKEDTYPES.fields_by_name['packed_enum'].enum_type = _FOREIGNENUM
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum'].enum_type = _TESTALLTYPES_NESTEDENUM
|
||||
_NESTEDTESTALLTYPES.fields_by_name['child'].message_type = _NESTEDTESTALLTYPES
|
||||
_NESTEDTESTALLTYPES.fields_by_name['payload'].message_type = _TESTALLTYPES
|
||||
_NESTEDTESTALLTYPES.fields_by_name['repeated_child'].message_type = _NESTEDTESTALLTYPES
|
||||
DESCRIPTOR.message_types_by_name['TestAllTypes'] = _TESTALLTYPES
|
||||
DESCRIPTOR.message_types_by_name['TestPackedTypes'] = _TESTPACKEDTYPES
|
||||
DESCRIPTOR.message_types_by_name['TestUnpackedTypes'] = _TESTUNPACKEDTYPES
|
||||
|
||||
@@ -72,7 +72,7 @@ _MESSAGETYPE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -103,154 +103,154 @@ _TESTMESSAGE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int32_value', full_name='proto3.TestMessage.int32_value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int64_value', full_name='proto3.TestMessage.int64_value', index=2,
|
||||
number=3, type=3, cpp_type=2, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint32_value', full_name='proto3.TestMessage.uint32_value', index=3,
|
||||
number=4, type=13, cpp_type=3, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint64_value', full_name='proto3.TestMessage.uint64_value', index=4,
|
||||
number=5, type=4, cpp_type=4, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='float_value', full_name='proto3.TestMessage.float_value', index=5,
|
||||
number=6, type=2, cpp_type=6, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='double_value', full_name='proto3.TestMessage.double_value', index=6,
|
||||
number=7, type=1, cpp_type=5, label=1,
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='string_value', full_name='proto3.TestMessage.string_value', index=7,
|
||||
number=8, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bytes_value', full_name='proto3.TestMessage.bytes_value', index=8,
|
||||
number=9, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='enum_value', full_name='proto3.TestMessage.enum_value', index=9,
|
||||
number=10, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='message_value', full_name='proto3.TestMessage.message_value', index=10,
|
||||
number=11, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool_value', full_name='proto3.TestMessage.repeated_bool_value', index=11,
|
||||
number=21, type=8, cpp_type=7, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int32_value', full_name='proto3.TestMessage.repeated_int32_value', index=12,
|
||||
number=22, type=5, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64_value', full_name='proto3.TestMessage.repeated_int64_value', index=13,
|
||||
number=23, type=3, cpp_type=2, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32_value', full_name='proto3.TestMessage.repeated_uint32_value', index=14,
|
||||
number=24, type=13, cpp_type=3, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64_value', full_name='proto3.TestMessage.repeated_uint64_value', index=15,
|
||||
number=25, type=4, cpp_type=4, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float_value', full_name='proto3.TestMessage.repeated_float_value', index=16,
|
||||
number=26, type=2, cpp_type=6, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double_value', full_name='proto3.TestMessage.repeated_double_value', index=17,
|
||||
number=27, type=1, cpp_type=5, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_string_value', full_name='proto3.TestMessage.repeated_string_value', index=18,
|
||||
number=28, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bytes_value', full_name='proto3.TestMessage.repeated_bytes_value', index=19,
|
||||
number=29, type=12, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_enum_value', full_name='proto3.TestMessage.repeated_enum_value', index=20,
|
||||
number=30, type=14, cpp_type=8, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_message_value', full_name='proto3.TestMessage.repeated_message_value', index=21,
|
||||
number=31, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -281,35 +281,35 @@ _TESTONEOF = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_string_value', full_name='proto3.TestOneof.oneof_string_value', index=1,
|
||||
number=2, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_bytes_value', full_name='proto3.TestOneof.oneof_bytes_value', index=2,
|
||||
number=3, type=12, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_enum_value', full_name='proto3.TestOneof.oneof_enum_value', index=3,
|
||||
number=4, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='oneof_message_value', full_name='proto3.TestOneof.oneof_message_value', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -343,14 +343,14 @@ _TESTMAP_BOOLMAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestMap.BoolMapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -380,14 +380,14 @@ _TESTMAP_INT32MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestMap.Int32MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -417,14 +417,14 @@ _TESTMAP_INT64MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestMap.Int64MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -454,14 +454,14 @@ _TESTMAP_UINT32MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestMap.Uint32MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -491,14 +491,14 @@ _TESTMAP_UINT64MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestMap.Uint64MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -528,14 +528,14 @@ _TESTMAP_STRINGMAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestMap.StringMapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -565,42 +565,42 @@ _TESTMAP = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int32_map', full_name='proto3.TestMap.int32_map', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int64_map', full_name='proto3.TestMap.int64_map', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint32_map', full_name='proto3.TestMap.uint32_map', index=3,
|
||||
number=4, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint64_map', full_name='proto3.TestMap.uint64_map', index=4,
|
||||
number=5, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='string_map', full_name='proto3.TestMap.string_map', index=5,
|
||||
number=6, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -631,14 +631,14 @@ _TESTNESTEDMAP_BOOLMAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.BoolMapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -668,14 +668,14 @@ _TESTNESTEDMAP_INT32MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.Int32MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -705,14 +705,14 @@ _TESTNESTEDMAP_INT64MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.Int64MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -742,14 +742,14 @@ _TESTNESTEDMAP_UINT32MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.Uint32MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -779,14 +779,14 @@ _TESTNESTEDMAP_UINT64MAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.Uint64MapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -816,14 +816,14 @@ _TESTNESTEDMAP_STRINGMAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.StringMapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -853,14 +853,14 @@ _TESTNESTEDMAP_MAPMAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestNestedMap.MapMapEntry.value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -890,49 +890,49 @@ _TESTNESTEDMAP = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int32_map', full_name='proto3.TestNestedMap.int32_map', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int64_map', full_name='proto3.TestNestedMap.int64_map', index=2,
|
||||
number=3, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint32_map', full_name='proto3.TestNestedMap.uint32_map', index=3,
|
||||
number=4, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint64_map', full_name='proto3.TestNestedMap.uint64_map', index=4,
|
||||
number=5, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='string_map', full_name='proto3.TestNestedMap.string_map', index=5,
|
||||
number=6, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='map_map', full_name='proto3.TestNestedMap.map_map', index=6,
|
||||
number=7, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -963,126 +963,126 @@ _TESTWRAPPER = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int32_value', full_name='proto3.TestWrapper.int32_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int64_value', full_name='proto3.TestWrapper.int64_value', index=2,
|
||||
number=3, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint32_value', full_name='proto3.TestWrapper.uint32_value', index=3,
|
||||
number=4, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='uint64_value', full_name='proto3.TestWrapper.uint64_value', index=4,
|
||||
number=5, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='float_value', full_name='proto3.TestWrapper.float_value', index=5,
|
||||
number=6, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='double_value', full_name='proto3.TestWrapper.double_value', index=6,
|
||||
number=7, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='string_value', full_name='proto3.TestWrapper.string_value', index=7,
|
||||
number=8, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bytes_value', full_name='proto3.TestWrapper.bytes_value', index=8,
|
||||
number=9, type=11, cpp_type=10, label=1,
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bool_value', full_name='proto3.TestWrapper.repeated_bool_value', index=9,
|
||||
number=11, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int32_value', full_name='proto3.TestWrapper.repeated_int32_value', index=10,
|
||||
number=12, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int64_value', full_name='proto3.TestWrapper.repeated_int64_value', index=11,
|
||||
number=13, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint32_value', full_name='proto3.TestWrapper.repeated_uint32_value', index=12,
|
||||
number=14, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_uint64_value', full_name='proto3.TestWrapper.repeated_uint64_value', index=13,
|
||||
number=15, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_float_value', full_name='proto3.TestWrapper.repeated_float_value', index=14,
|
||||
number=16, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_double_value', full_name='proto3.TestWrapper.repeated_double_value', index=15,
|
||||
number=17, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_string_value', full_name='proto3.TestWrapper.repeated_string_value', index=16,
|
||||
number=18, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_bytes_value', full_name='proto3.TestWrapper.repeated_bytes_value', index=17,
|
||||
number=19, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1113,14 +1113,14 @@ _TESTTIMESTAMP = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_value', full_name='proto3.TestTimestamp.repeated_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1151,14 +1151,14 @@ _TESTDURATION = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_value', full_name='proto3.TestDuration.repeated_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1189,7 +1189,7 @@ _TESTFIELDMASK = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1220,14 +1220,14 @@ _TESTSTRUCT = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_value', full_name='proto3.TestStruct.repeated_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1258,14 +1258,14 @@ _TESTANY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_value', full_name='proto3.TestAny.repeated_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1296,14 +1296,14 @@ _TESTVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_value', full_name='proto3.TestValue.repeated_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1334,14 +1334,14 @@ _TESTLISTVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_value', full_name='proto3.TestListValue.repeated_value', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1372,14 +1372,14 @@ _TESTBOOLVALUE_BOOLMAPENTRY = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='proto3.TestBoolValue.BoolMapEntry.value', index=1,
|
||||
number=2, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1409,14 +1409,14 @@ _TESTBOOLVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bool_map', full_name='proto3.TestBoolValue.bool_map', index=1,
|
||||
number=2, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1447,7 +1447,7 @@ _TESTCUSTOMJSONNAME = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, json_name='@value'),
|
||||
options=None, json_name='@value', file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -1478,7 +1478,7 @@ _TESTEXTENSIONS = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=None,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
@@ -38,7 +38,7 @@ _DOUBLEVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -69,7 +69,7 @@ _FLOATVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=float(0),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -100,7 +100,7 @@ _INT64VALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -131,7 +131,7 @@ _UINT64VALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -162,7 +162,7 @@ _INT32VALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -193,7 +193,7 @@ _UINT32VALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -224,7 +224,7 @@ _BOOLVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=False,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -255,7 +255,7 @@ _STRINGVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -286,7 +286,7 @@ _BYTESVALUE = _descriptor.Descriptor(
|
||||
has_default_value=False, default_value=_b(""),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
||||
Reference in new issue
Block a user