proto36
This commit is contained in:
1 parent
a28e541be0
commit
e2dd18b3fa
421 files changed
+23599
-30913
No files matched your search
@@ -30,7 +30,7 @@
|
||||
|
||||
# Copyright 2007 Google Inc. All Rights Reserved.
|
||||
|
||||
__version__ = '3.5.0'
|
||||
__version__ = '3.6.0'
|
||||
|
||||
if __name__ != '__main__':
|
||||
try:
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/any.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\010AnyProtoP\001Z%github.com/golang/protobuf/ptypes/any\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x19google/protobuf/any.proto\x12\x0fgoogle.protobuf\"&\n\x03\x41ny\x12\x10\n\x08type_url\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\x42o\n\x13\x63om.google.protobufB\x08\x41nyProtoP\x01Z%github.com/golang/protobuf/ptypes/any\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,21 +38,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -73,6 +73,5 @@ Any = _reflection.GeneratedProtocolMessageType('Any', (_message.Message,), dict(
|
||||
_sym_db.RegisterMessage(Any)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\010AnyProtoP\001Z%github.com/golang/protobuf/ptypes/any\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/any_test.proto',
|
||||
package='protobuf_unittest',
|
||||
syntax='proto3',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n\x1egoogle/protobuf/any_test.proto\x12\x11protobuf_unittest\x1a\x19google/protobuf/any.proto\"y\n\x07TestAny\x12\x13\n\x0bint32_value\x18\x01 \x01(\x05\x12\'\n\tany_value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x30\n\x12repeated_any_value\x18\x03 \x03(\x0b\x32\x14.google.protobuf.Anyb\x06proto3')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,])
|
||||
@@ -40,28 +40,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -21,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/api.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\010ApiProtoP\001Z+google.golang.org/genproto/protobuf/api;api\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x19google/protobuf/api.proto\x12\x0fgoogle.protobuf\x1a$google/protobuf/source_context.proto\x1a\x1agoogle/protobuf/type.proto\"\x81\x02\n\x03\x41pi\x12\x0c\n\x04name\x18\x01 \x01(\t\x12(\n\x07methods\x18\x02 \x03(\x0b\x32\x17.google.protobuf.Method\x12(\n\x07options\x18\x03 \x03(\x0b\x32\x17.google.protobuf.Option\x12\x0f\n\x07version\x18\x04 \x01(\t\x12\x36\n\x0esource_context\x18\x05 \x01(\x0b\x32\x1e.google.protobuf.SourceContext\x12&\n\x06mixins\x18\x06 \x03(\x0b\x32\x16.google.protobuf.Mixin\x12\'\n\x06syntax\x18\x07 \x01(\x0e\x32\x17.google.protobuf.Syntax\"\xd5\x01\n\x06Method\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x18\n\x10request_type_url\x18\x02 \x01(\t\x12\x19\n\x11request_streaming\x18\x03 \x01(\x08\x12\x19\n\x11response_type_url\x18\x04 \x01(\t\x12\x1a\n\x12response_streaming\x18\x05 \x01(\x08\x12(\n\x07options\x18\x06 \x03(\x0b\x32\x17.google.protobuf.Option\x12\'\n\x06syntax\x18\x07 \x01(\x0e\x32\x17.google.protobuf.Syntax\"#\n\x05Mixin\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04root\x18\x02 \x01(\tBu\n\x13\x63om.google.protobufB\x08\x41piProtoP\x01Z+google.golang.org/genproto/protobuf/api;api\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_source__context__pb2.DESCRIPTOR,google_dot_protobuf_dot_type__pb2.DESCRIPTOR,])
|
||||
@@ -41,56 +41,56 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -114,56 +114,56 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -187,21 +187,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -245,6 +245,5 @@ Mixin = _reflection.GeneratedProtocolMessageType('Mixin', (_message.Message,), d
|
||||
_sym_db.RegisterMessage(Mixin)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\010ApiProtoP\001Z+google.golang.org/genproto/protobuf/api;api\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/compiler/plugin.proto',
|
||||
package='google.protobuf.compiler',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('\n\034com.google.protobuf.compilerB\014PluginProtosZ9github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go'),
|
||||
serialized_pb=_b('\n%google/protobuf/compiler/plugin.proto\x12\x18google.protobuf.compiler\x1a google/protobuf/descriptor.proto\"F\n\x07Version\x12\r\n\x05major\x18\x01 \x01(\x05\x12\r\n\x05minor\x18\x02 \x01(\x05\x12\r\n\x05patch\x18\x03 \x01(\x05\x12\x0e\n\x06suffix\x18\x04 \x01(\t\"\xba\x01\n\x14\x43odeGeneratorRequest\x12\x18\n\x10\x66ile_to_generate\x18\x01 \x03(\t\x12\x11\n\tparameter\x18\x02 \x01(\t\x12\x38\n\nproto_file\x18\x0f \x03(\x0b\x32$.google.protobuf.FileDescriptorProto\x12;\n\x10\x63ompiler_version\x18\x03 \x01(\x0b\x32!.google.protobuf.compiler.Version\"\xaa\x01\n\x15\x43odeGeneratorResponse\x12\r\n\x05\x65rror\x18\x01 \x01(\t\x12\x42\n\x04\x66ile\x18\x0f \x03(\x0b\x32\x34.google.protobuf.compiler.CodeGeneratorResponse.File\x1a>\n\x04\x46ile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x17\n\x0finsertion_point\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x0f \x01(\tBg\n\x1c\x63om.google.protobuf.compilerB\x0cPluginProtosZ9github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,])
|
||||
@@ -40,35 +40,35 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -92,35 +92,35 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -144,28 +144,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -188,21 +188,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_CODEGENERATORRESPONSE_FILE, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -251,6 +251,5 @@ _sym_db.RegisterMessage(CodeGeneratorResponse)
|
||||
_sym_db.RegisterMessage(CodeGeneratorResponse.File)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\034com.google.protobuf.compilerB\014PluginProtosZ9github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -34,6 +34,7 @@ file, in types that make this information accessible in Python.
|
||||
|
||||
__author__ = 'robinson@google.com (Will Robinson)'
|
||||
|
||||
import threading
|
||||
import six
|
||||
|
||||
from google.protobuf.internal import api_implementation
|
||||
@@ -41,8 +42,8 @@ from google.protobuf.internal import api_implementation
|
||||
_USE_C_DESCRIPTORS = False
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# Used by MakeDescriptor in cpp mode
|
||||
import binascii
|
||||
import os
|
||||
import uuid
|
||||
from google.protobuf.pyext import _message
|
||||
_USE_C_DESCRIPTORS = getattr(_message, '_USE_C_DESCRIPTORS', False)
|
||||
|
||||
@@ -72,6 +73,24 @@ else:
|
||||
DescriptorMetaclass = type
|
||||
|
||||
|
||||
class _Lock(object):
|
||||
"""Wrapper class of threading.Lock(), which is allowed by 'with'."""
|
||||
|
||||
def __new__(cls):
|
||||
self = object.__new__(cls)
|
||||
self._lock = threading.Lock() # pylint: disable=protected-access
|
||||
return self
|
||||
|
||||
def __enter__(self):
|
||||
self._lock.acquire()
|
||||
|
||||
def __exit__(self, exc_type, exc_value, exc_tb):
|
||||
self._lock.release()
|
||||
|
||||
|
||||
_lock = threading.Lock()
|
||||
|
||||
|
||||
class DescriptorBase(six.with_metaclass(DescriptorMetaclass)):
|
||||
|
||||
"""Descriptors base class.
|
||||
@@ -92,16 +111,17 @@ class DescriptorBase(six.with_metaclass(DescriptorMetaclass)):
|
||||
# subclasses" of this descriptor class.
|
||||
_C_DESCRIPTOR_CLASS = ()
|
||||
|
||||
def __init__(self, options, options_class_name):
|
||||
def __init__(self, options, serialized_options, options_class_name):
|
||||
"""Initialize the descriptor given its options message and the name of the
|
||||
class of the options message. The name of the class is required in case
|
||||
the options message is None and has to be created.
|
||||
"""
|
||||
self._options = options
|
||||
self._options_class_name = options_class_name
|
||||
self._serialized_options = serialized_options
|
||||
|
||||
# Does this descriptor have non-default options?
|
||||
self.has_options = options is not None
|
||||
self.has_options = (options is not None) or (serialized_options is not None)
|
||||
|
||||
def _SetOptions(self, options, options_class_name):
|
||||
"""Sets the descriptor's options
|
||||
@@ -123,14 +143,23 @@ class DescriptorBase(six.with_metaclass(DescriptorMetaclass)):
|
||||
"""
|
||||
if self._options:
|
||||
return self._options
|
||||
|
||||
from google.protobuf import descriptor_pb2
|
||||
try:
|
||||
options_class = getattr(descriptor_pb2, self._options_class_name)
|
||||
options_class = getattr(descriptor_pb2,
|
||||
self._options_class_name)
|
||||
except AttributeError:
|
||||
raise RuntimeError('Unknown options class name %s!' %
|
||||
(self._options_class_name))
|
||||
self._options = options_class()
|
||||
return self._options
|
||||
|
||||
with _lock:
|
||||
if self._serialized_options is None:
|
||||
self._options = options_class()
|
||||
else:
|
||||
self._options = _ParseOptions(options_class(),
|
||||
self._serialized_options)
|
||||
|
||||
return self._options
|
||||
|
||||
|
||||
class _NestedDescriptorBase(DescriptorBase):
|
||||
@@ -138,7 +167,7 @@ class _NestedDescriptorBase(DescriptorBase):
|
||||
|
||||
def __init__(self, options, options_class_name, name, full_name,
|
||||
file, containing_type, serialized_start=None,
|
||||
serialized_end=None):
|
||||
serialized_end=None, serialized_options=None):
|
||||
"""Constructor.
|
||||
|
||||
Args:
|
||||
@@ -157,9 +186,10 @@ class _NestedDescriptorBase(DescriptorBase):
|
||||
file.serialized_pb that describes this descriptor.
|
||||
serialized_end: The end index (exclusive) in block in the
|
||||
file.serialized_pb that describes this descriptor.
|
||||
serialized_options: Protocol message serilized options or None.
|
||||
"""
|
||||
super(_NestedDescriptorBase, self).__init__(
|
||||
options, options_class_name)
|
||||
options, serialized_options, options_class_name)
|
||||
|
||||
self.name = name
|
||||
# TODO(falk): Add function to calculate full_name instead of having it in
|
||||
@@ -250,6 +280,7 @@ class Descriptor(_NestedDescriptorBase):
|
||||
|
||||
def __new__(cls, name, full_name, filename, containing_type, fields,
|
||||
nested_types, enum_types, extensions, options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True, extension_ranges=None, oneofs=None,
|
||||
file=None, serialized_start=None, serialized_end=None, # pylint: disable=redefined-builtin
|
||||
syntax=None):
|
||||
@@ -261,6 +292,7 @@ class Descriptor(_NestedDescriptorBase):
|
||||
# name of the argument.
|
||||
def __init__(self, name, full_name, filename, containing_type, fields,
|
||||
nested_types, enum_types, extensions, options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True, extension_ranges=None, oneofs=None,
|
||||
file=None, serialized_start=None, serialized_end=None, # pylint: disable=redefined-builtin
|
||||
syntax=None):
|
||||
@@ -273,7 +305,7 @@ class Descriptor(_NestedDescriptorBase):
|
||||
super(Descriptor, self).__init__(
|
||||
options, 'MessageOptions', name, full_name, file,
|
||||
containing_type, serialized_start=serialized_start,
|
||||
serialized_end=serialized_end)
|
||||
serialized_end=serialized_end, serialized_options=serialized_options)
|
||||
|
||||
# We have fields in addition to fields_by_name and fields_by_number,
|
||||
# so that:
|
||||
@@ -492,8 +524,9 @@ 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,
|
||||
serialized_options=None,
|
||||
has_default_value=True, containing_oneof=None, json_name=None,
|
||||
file=None):
|
||||
file=None): # pylint: disable=redefined-builtin
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
if is_extension:
|
||||
return _message.default_pool.FindExtensionByName(full_name)
|
||||
@@ -503,8 +536,9 @@ 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,
|
||||
serialized_options=None,
|
||||
has_default_value=True, containing_oneof=None, json_name=None,
|
||||
file=None):
|
||||
file=None): # pylint: disable=redefined-builtin
|
||||
"""The arguments are as described in the description of FieldDescriptor
|
||||
attributes above.
|
||||
|
||||
@@ -512,7 +546,8 @@ class FieldDescriptor(DescriptorBase):
|
||||
(to deal with circular references between message types, for example).
|
||||
Likewise for extension_scope.
|
||||
"""
|
||||
super(FieldDescriptor, self).__init__(options, 'FieldOptions')
|
||||
super(FieldDescriptor, self).__init__(
|
||||
options, serialized_options, 'FieldOptions')
|
||||
self.name = name
|
||||
self.full_name = full_name
|
||||
self.file = file
|
||||
@@ -598,13 +633,15 @@ class EnumDescriptor(_NestedDescriptorBase):
|
||||
_C_DESCRIPTOR_CLASS = _message.EnumDescriptor
|
||||
|
||||
def __new__(cls, name, full_name, filename, values,
|
||||
containing_type=None, options=None, file=None,
|
||||
containing_type=None, options=None,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
return _message.default_pool.FindEnumTypeByName(full_name)
|
||||
|
||||
def __init__(self, name, full_name, filename, values,
|
||||
containing_type=None, options=None, file=None,
|
||||
containing_type=None, options=None,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
"""Arguments are as described in the attribute description above.
|
||||
|
||||
@@ -614,7 +651,7 @@ class EnumDescriptor(_NestedDescriptorBase):
|
||||
super(EnumDescriptor, self).__init__(
|
||||
options, 'EnumOptions', name, full_name, file,
|
||||
containing_type, serialized_start=serialized_start,
|
||||
serialized_end=serialized_end)
|
||||
serialized_end=serialized_end, serialized_options=serialized_options)
|
||||
|
||||
self.values = values
|
||||
for value in self.values:
|
||||
@@ -650,7 +687,9 @@ class EnumValueDescriptor(DescriptorBase):
|
||||
if _USE_C_DESCRIPTORS:
|
||||
_C_DESCRIPTOR_CLASS = _message.EnumValueDescriptor
|
||||
|
||||
def __new__(cls, name, index, number, type=None, options=None):
|
||||
def __new__(cls, name, index, number,
|
||||
type=None, # pylint: disable=redefined-builtin
|
||||
options=None, serialized_options=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
# There is no way we can build a complete EnumValueDescriptor with the
|
||||
# given parameters (the name of the Enum is not known, for example).
|
||||
@@ -658,9 +697,12 @@ class EnumValueDescriptor(DescriptorBase):
|
||||
# constructor, which will ignore it, so returning None is good enough.
|
||||
return None
|
||||
|
||||
def __init__(self, name, index, number, type=None, options=None):
|
||||
def __init__(self, name, index, number,
|
||||
type=None, # pylint: disable=redefined-builtin
|
||||
options=None, serialized_options=None):
|
||||
"""Arguments are as described in the attribute description above."""
|
||||
super(EnumValueDescriptor, self).__init__(options, 'EnumValueOptions')
|
||||
super(EnumValueDescriptor, self).__init__(
|
||||
options, serialized_options, 'EnumValueOptions')
|
||||
self.name = name
|
||||
self.index = index
|
||||
self.number = number
|
||||
@@ -685,14 +727,17 @@ class OneofDescriptor(DescriptorBase):
|
||||
_C_DESCRIPTOR_CLASS = _message.OneofDescriptor
|
||||
|
||||
def __new__(
|
||||
cls, name, full_name, index, containing_type, fields, options=None):
|
||||
cls, name, full_name, index, containing_type, fields, options=None,
|
||||
serialized_options=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
return _message.default_pool.FindOneofByName(full_name)
|
||||
|
||||
def __init__(
|
||||
self, name, full_name, index, containing_type, fields, options=None):
|
||||
self, name, full_name, index, containing_type, fields, options=None,
|
||||
serialized_options=None):
|
||||
"""Arguments are as described in the attribute description above."""
|
||||
super(OneofDescriptor, self).__init__(options, 'OneofOptions')
|
||||
super(OneofDescriptor, self).__init__(
|
||||
options, serialized_options, 'OneofOptions')
|
||||
self.name = name
|
||||
self.full_name = full_name
|
||||
self.index = index
|
||||
@@ -721,17 +766,19 @@ class ServiceDescriptor(_NestedDescriptorBase):
|
||||
if _USE_C_DESCRIPTORS:
|
||||
_C_DESCRIPTOR_CLASS = _message.ServiceDescriptor
|
||||
|
||||
def __new__(cls, name, full_name, index, methods, options=None, file=None, # pylint: disable=redefined-builtin
|
||||
def __new__(cls, name, full_name, index, methods, options=None,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile() # pylint: disable=protected-access
|
||||
return _message.default_pool.FindServiceByName(full_name)
|
||||
|
||||
def __init__(self, name, full_name, index, methods, options=None, file=None,
|
||||
def __init__(self, name, full_name, index, methods, options=None,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
super(ServiceDescriptor, self).__init__(
|
||||
options, 'ServiceOptions', name, full_name, file,
|
||||
None, serialized_start=serialized_start,
|
||||
serialized_end=serialized_end)
|
||||
serialized_end=serialized_end, serialized_options=serialized_options)
|
||||
self.index = index
|
||||
self.methods = methods
|
||||
self.methods_by_name = dict((m.name, m) for m in methods)
|
||||
@@ -772,18 +819,19 @@ class MethodDescriptor(DescriptorBase):
|
||||
_C_DESCRIPTOR_CLASS = _message.MethodDescriptor
|
||||
|
||||
def __new__(cls, name, full_name, index, containing_service,
|
||||
input_type, output_type, options=None):
|
||||
input_type, output_type, options=None, serialized_options=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile() # pylint: disable=protected-access
|
||||
return _message.default_pool.FindMethodByName(full_name)
|
||||
|
||||
def __init__(self, name, full_name, index, containing_service,
|
||||
input_type, output_type, options=None):
|
||||
input_type, output_type, options=None, serialized_options=None):
|
||||
"""The arguments are as described in the description of MethodDescriptor
|
||||
attributes above.
|
||||
|
||||
Note that containing_service may be None, and may be set later if necessary.
|
||||
"""
|
||||
super(MethodDescriptor, self).__init__(options, 'MethodOptions')
|
||||
super(MethodDescriptor, self).__init__(
|
||||
options, serialized_options, 'MethodOptions')
|
||||
self.name = name
|
||||
self.full_name = full_name
|
||||
self.index = index
|
||||
@@ -818,7 +866,8 @@ class FileDescriptor(DescriptorBase):
|
||||
if _USE_C_DESCRIPTORS:
|
||||
_C_DESCRIPTOR_CLASS = _message.FileDescriptor
|
||||
|
||||
def __new__(cls, name, package, options=None, serialized_pb=None,
|
||||
def __new__(cls, name, package, options=None,
|
||||
serialized_options=None, serialized_pb=None,
|
||||
dependencies=None, public_dependencies=None,
|
||||
syntax=None, pool=None):
|
||||
# FileDescriptor() is called from various places, not only from generated
|
||||
@@ -830,11 +879,13 @@ class FileDescriptor(DescriptorBase):
|
||||
else:
|
||||
return super(FileDescriptor, cls).__new__(cls)
|
||||
|
||||
def __init__(self, name, package, options=None, serialized_pb=None,
|
||||
def __init__(self, name, package, options=None,
|
||||
serialized_options=None, serialized_pb=None,
|
||||
dependencies=None, public_dependencies=None,
|
||||
syntax=None, pool=None):
|
||||
"""Constructor."""
|
||||
super(FileDescriptor, self).__init__(options, 'FileOptions')
|
||||
super(FileDescriptor, self).__init__(
|
||||
options, serialized_options, 'FileOptions')
|
||||
|
||||
if pool is None:
|
||||
from google.protobuf import descriptor_pool
|
||||
@@ -952,7 +1003,7 @@ def MakeDescriptor(desc_proto, package='', build_file_if_cpp=True,
|
||||
# imported ones. We need to specify a file name so the descriptor pool
|
||||
# accepts our FileDescriptorProto, but it is not important what that file
|
||||
# name is actually set to.
|
||||
proto_name = str(uuid.uuid4())
|
||||
proto_name = binascii.hexlify(os.urandom(16)).decode('ascii')
|
||||
|
||||
if package:
|
||||
file_descriptor_proto.name = os.path.join(package.replace('.', '/'),
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
|
||||
__author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
import warnings
|
||||
|
||||
|
||||
class Error(Exception):
|
||||
pass
|
||||
@@ -64,21 +66,20 @@ class DescriptorDatabase(object):
|
||||
elif self._file_desc_protos_by_file[proto_name] != file_desc_proto:
|
||||
raise DescriptorDatabaseConflictingDefinitionError(
|
||||
'%s already added, but with different descriptor.' % proto_name)
|
||||
else:
|
||||
return
|
||||
|
||||
# Add all the top-level descriptors to the index.
|
||||
package = file_desc_proto.package
|
||||
for message in file_desc_proto.message_type:
|
||||
self._file_desc_protos_by_symbol.update(
|
||||
(name, file_desc_proto) for name in _ExtractSymbols(message, package))
|
||||
for name in _ExtractSymbols(message, package):
|
||||
self._AddSymbol(name, file_desc_proto)
|
||||
for enum in file_desc_proto.enum_type:
|
||||
self._file_desc_protos_by_symbol[
|
||||
'.'.join((package, enum.name))] = file_desc_proto
|
||||
self._AddSymbol(('.'.join((package, enum.name))), file_desc_proto)
|
||||
for extension in file_desc_proto.extension:
|
||||
self._file_desc_protos_by_symbol[
|
||||
'.'.join((package, extension.name))] = file_desc_proto
|
||||
self._AddSymbol(('.'.join((package, extension.name))), file_desc_proto)
|
||||
for service in file_desc_proto.service:
|
||||
self._file_desc_protos_by_symbol[
|
||||
'.'.join((package, service.name))] = file_desc_proto
|
||||
self._AddSymbol(('.'.join((package, service.name))), file_desc_proto)
|
||||
|
||||
def FindFileByName(self, name):
|
||||
"""Finds the file descriptor proto by file name.
|
||||
@@ -132,6 +133,15 @@ class DescriptorDatabase(object):
|
||||
top_level, _, _ = symbol.rpartition('.')
|
||||
return self._file_desc_protos_by_symbol[top_level]
|
||||
|
||||
def _AddSymbol(self, name, file_desc_proto):
|
||||
if name in self._file_desc_protos_by_symbol:
|
||||
warn_msg = ('Conflict register for file "' + file_desc_proto.name +
|
||||
'": ' + name +
|
||||
' is already defined in file "' +
|
||||
self._file_desc_protos_by_symbol[name].name + '"')
|
||||
warnings.warn(warn_msg, RuntimeWarning)
|
||||
self._file_desc_protos_by_symbol[name] = file_desc_proto
|
||||
|
||||
|
||||
def _ExtractSymbols(desc_proto, package):
|
||||
"""Pulls out all the symbols from a descriptor proto.
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -58,6 +58,7 @@ directly instead of this class.
|
||||
__author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
import collections
|
||||
import warnings
|
||||
|
||||
from google.protobuf import descriptor
|
||||
from google.protobuf import descriptor_database
|
||||
@@ -127,12 +128,38 @@ class DescriptorPool(object):
|
||||
self._service_descriptors = {}
|
||||
self._file_descriptors = {}
|
||||
self._toplevel_extensions = {}
|
||||
# TODO(jieluo): Remove _file_desc_by_toplevel_extension after
|
||||
# maybe year 2020 for compatibility issue (with 3.4.1 only).
|
||||
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.
|
||||
self._extensions_by_name = collections.defaultdict(dict)
|
||||
self._extensions_by_number = collections.defaultdict(dict)
|
||||
|
||||
def _CheckConflictRegister(self, desc):
|
||||
"""Check if the descriptor name conflicts with another of the same name.
|
||||
|
||||
Args:
|
||||
desc: Descriptor of a message, enum, service or extension.
|
||||
"""
|
||||
desc_name = desc.full_name
|
||||
for register, descriptor_type in [
|
||||
(self._descriptors, descriptor.Descriptor),
|
||||
(self._enum_descriptors, descriptor.EnumDescriptor),
|
||||
(self._service_descriptors, descriptor.ServiceDescriptor),
|
||||
(self._toplevel_extensions, descriptor.FieldDescriptor)]:
|
||||
if desc_name in register:
|
||||
file_name = register[desc_name].file.name
|
||||
if not isinstance(desc, descriptor_type) or (
|
||||
file_name != desc.file.name):
|
||||
warn_msg = ('Conflict register for file "' + desc.file.name +
|
||||
'": ' + desc_name +
|
||||
' is already defined in file "' +
|
||||
file_name + '"')
|
||||
warnings.warn(warn_msg, RuntimeWarning)
|
||||
return
|
||||
|
||||
def Add(self, file_desc_proto):
|
||||
"""Adds the FileDescriptorProto and its types to this pool.
|
||||
|
||||
@@ -169,6 +196,8 @@ class DescriptorPool(object):
|
||||
if not isinstance(desc, descriptor.Descriptor):
|
||||
raise TypeError('Expected instance of descriptor.Descriptor.')
|
||||
|
||||
self._CheckConflictRegister(desc)
|
||||
|
||||
self._descriptors[desc.full_name] = desc
|
||||
self._AddFileDescriptor(desc.file)
|
||||
|
||||
@@ -184,6 +213,7 @@ class DescriptorPool(object):
|
||||
if not isinstance(enum_desc, descriptor.EnumDescriptor):
|
||||
raise TypeError('Expected instance of descriptor.EnumDescriptor.')
|
||||
|
||||
self._CheckConflictRegister(enum_desc)
|
||||
self._enum_descriptors[enum_desc.full_name] = enum_desc
|
||||
self._AddFileDescriptor(enum_desc.file)
|
||||
|
||||
@@ -197,6 +227,7 @@ class DescriptorPool(object):
|
||||
if not isinstance(service_desc, descriptor.ServiceDescriptor):
|
||||
raise TypeError('Expected instance of descriptor.ServiceDescriptor.')
|
||||
|
||||
self._CheckConflictRegister(service_desc)
|
||||
self._service_descriptors[service_desc.full_name] = service_desc
|
||||
|
||||
def AddExtensionDescriptor(self, extension):
|
||||
@@ -216,6 +247,7 @@ class DescriptorPool(object):
|
||||
raise TypeError('Expected an extension descriptor.')
|
||||
|
||||
if extension.extension_scope is None:
|
||||
self._CheckConflictRegister(extension)
|
||||
self._toplevel_extensions[extension.full_name] = extension
|
||||
|
||||
try:
|
||||
@@ -252,6 +284,12 @@ class DescriptorPool(object):
|
||||
"""
|
||||
|
||||
self._AddFileDescriptor(file_desc)
|
||||
# TODO(jieluo): This is a temporary solution for FieldDescriptor.file.
|
||||
# FieldDescriptor.file is added in code gen. Remove this solution after
|
||||
# maybe 2020 for compatibility reason (with 3.4.1 only).
|
||||
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.
|
||||
@@ -331,7 +369,7 @@ class DescriptorPool(object):
|
||||
pass
|
||||
|
||||
try:
|
||||
return self._toplevel_extensions[symbol].file
|
||||
return self._file_desc_by_toplevel_extension[symbol]
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
@@ -680,6 +718,7 @@ class DescriptorPool(object):
|
||||
fields[field_index].containing_oneof = oneofs[oneof_index]
|
||||
|
||||
scope[_PrefixWithDot(desc_name)] = desc
|
||||
self._CheckConflictRegister(desc)
|
||||
self._descriptors[desc_name] = desc
|
||||
return desc
|
||||
|
||||
@@ -718,6 +757,7 @@ class DescriptorPool(object):
|
||||
containing_type=containing_type,
|
||||
options=_OptionsOrNone(enum_proto))
|
||||
scope['.%s' % enum_name] = desc
|
||||
self._CheckConflictRegister(desc)
|
||||
self._enum_descriptors[enum_name] = desc
|
||||
return desc
|
||||
|
||||
@@ -914,6 +954,7 @@ class DescriptorPool(object):
|
||||
methods=methods,
|
||||
options=_OptionsOrNone(service_proto),
|
||||
file=file_desc)
|
||||
self._CheckConflictRegister(desc)
|
||||
self._service_descriptors[service_name] = desc
|
||||
return desc
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/duration.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\rDurationProtoP\001Z*github.com/golang/protobuf/ptypes/duration\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x1egoogle/protobuf/duration.proto\x12\x0fgoogle.protobuf\"*\n\x08\x44uration\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\x42|\n\x13\x63om.google.protobufB\rDurationProtoP\x01Z*github.com/golang/protobuf/ptypes/duration\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,21 +38,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -73,6 +73,5 @@ Duration = _reflection.GeneratedProtocolMessageType('Duration', (_message.Messag
|
||||
_sym_db.RegisterMessage(Duration)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\rDurationProtoP\001Z*github.com/golang/protobuf/ptypes/duration\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/empty.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\nEmptyProtoP\001Z\'github.com/golang/protobuf/ptypes/empty\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x1bgoogle/protobuf/empty.proto\x12\x0fgoogle.protobuf\"\x07\n\x05\x45mptyBv\n\x13\x63om.google.protobufB\nEmptyProtoP\x01Z\'github.com/golang/protobuf/ptypes/empty\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,7 +38,7 @@ _EMPTY = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -59,6 +59,5 @@ Empty = _reflection.GeneratedProtocolMessageType('Empty', (_message.Message,), d
|
||||
_sym_db.RegisterMessage(Empty)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\nEmptyProtoP\001Z\'github.com/golang/protobuf/ptypes/empty\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/field_mask.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\016FieldMaskProtoP\001Z9google.golang.org/genproto/protobuf/field_mask;field_mask\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n google/protobuf/field_mask.proto\x12\x0fgoogle.protobuf\"\x1a\n\tFieldMask\x12\r\n\x05paths\x18\x01 \x03(\tB\x89\x01\n\x13\x63om.google.protobufB\x0e\x46ieldMaskProtoP\x01Z9google.golang.org/genproto/protobuf/field_mask;field_mask\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,14 +38,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -66,6 +66,5 @@ FieldMask = _reflection.GeneratedProtocolMessageType('FieldMask', (_message.Mess
|
||||
_sym_db.RegisterMessage(FieldMask)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\016FieldMaskProtoP\001Z9google.golang.org/genproto/protobuf/field_mask;field_mask\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -37,8 +37,8 @@ argument tuples.
|
||||
|
||||
A simple example:
|
||||
|
||||
class AdditionExample(parameterized.ParameterizedTestCase):
|
||||
@parameterized.Parameters(
|
||||
class AdditionExample(parameterized.TestCase):
|
||||
@parameterized.parameters(
|
||||
(1, 2, 3),
|
||||
(4, 5, 9),
|
||||
(1, 1, 3))
|
||||
@@ -54,8 +54,8 @@ fail due to an assertion error (1 + 1 != 3).
|
||||
Parameters for invididual test cases can be tuples (with positional parameters)
|
||||
or dictionaries (with named parameters):
|
||||
|
||||
class AdditionExample(parameterized.ParameterizedTestCase):
|
||||
@parameterized.Parameters(
|
||||
class AdditionExample(parameterized.TestCase):
|
||||
@parameterized.parameters(
|
||||
{'op1': 1, 'op2': 2, 'result': 3},
|
||||
{'op1': 4, 'op2': 5, 'result': 9},
|
||||
)
|
||||
@@ -77,13 +77,13 @@ stay the same across several invocations, object representations like
|
||||
'<__main__.Foo object at 0x23d8610>'
|
||||
|
||||
are turned into '<__main__.Foo>'. For even more descriptive names,
|
||||
especially in test logs, you can use the NamedParameters decorator. In
|
||||
especially in test logs, you can use the named_parameters decorator. In
|
||||
this case, only tuples are supported, and the first parameters has to
|
||||
be a string (or an object that returns an apt name when converted via
|
||||
str()):
|
||||
|
||||
class NamedExample(parameterized.ParameterizedTestCase):
|
||||
@parameterized.NamedParameters(
|
||||
class NamedExample(parameterized.TestCase):
|
||||
@parameterized.named_parameters(
|
||||
('Normal', 'aa', 'aaa', True),
|
||||
('EmptyPrefix', '', 'abc', True),
|
||||
('BothEmpty', '', '', True))
|
||||
@@ -103,13 +103,13 @@ from the command line:
|
||||
Parameterized Classes
|
||||
=====================
|
||||
If invocation arguments are shared across test methods in a single
|
||||
ParameterizedTestCase class, instead of decorating all test methods
|
||||
TestCase class, instead of decorating all test methods
|
||||
individually, the class itself can be decorated:
|
||||
|
||||
@parameterized.Parameters(
|
||||
@parameterized.parameters(
|
||||
(1, 2, 3)
|
||||
(4, 5, 9))
|
||||
class ArithmeticTest(parameterized.ParameterizedTestCase):
|
||||
class ArithmeticTest(parameterized.TestCase):
|
||||
def testAdd(self, arg1, arg2, result):
|
||||
self.assertEqual(arg1 + arg2, result)
|
||||
|
||||
@@ -122,8 +122,8 @@ If parameters should be shared across several test cases, or are dynamically
|
||||
created from other sources, a single non-tuple iterable can be passed into
|
||||
the decorator. This iterable will be used to obtain the test cases:
|
||||
|
||||
class AdditionExample(parameterized.ParameterizedTestCase):
|
||||
@parameterized.Parameters(
|
||||
class AdditionExample(parameterized.TestCase):
|
||||
@parameterized.parameters(
|
||||
c.op1, c.op2, c.result for c in testcases
|
||||
)
|
||||
def testAddition(self, op1, op2, result):
|
||||
@@ -135,8 +135,8 @@ Single-Argument Test Methods
|
||||
If a test method takes only one argument, the single argument does not need to
|
||||
be wrapped into a tuple:
|
||||
|
||||
class NegativeNumberExample(parameterized.ParameterizedTestCase):
|
||||
@parameterized.Parameters(
|
||||
class NegativeNumberExample(parameterized.TestCase):
|
||||
@parameterized.parameters(
|
||||
-1, -3, -4, -5
|
||||
)
|
||||
def testIsNegative(self, arg):
|
||||
@@ -212,7 +212,7 @@ class _ParameterizedTestIter(object):
|
||||
def __call__(self, *args, **kwargs):
|
||||
raise RuntimeError('You appear to be running a parameterized test case '
|
||||
'without having inherited from parameterized.'
|
||||
'ParameterizedTestCase. This is bad because none of '
|
||||
'TestCase. This is bad because none of '
|
||||
'your test cases are actually being run.')
|
||||
|
||||
def __iter__(self):
|
||||
@@ -306,7 +306,7 @@ def _ParameterDecorator(naming_type, testcases):
|
||||
return _Apply
|
||||
|
||||
|
||||
def Parameters(*testcases):
|
||||
def parameters(*testcases): # pylint: disable=invalid-name
|
||||
"""A decorator for creating parameterized tests.
|
||||
|
||||
See the module docstring for a usage example.
|
||||
@@ -321,7 +321,7 @@ def Parameters(*testcases):
|
||||
return _ParameterDecorator(_ARGUMENT_REPR, testcases)
|
||||
|
||||
|
||||
def NamedParameters(*testcases):
|
||||
def named_parameters(*testcases): # pylint: disable=invalid-name
|
||||
"""A decorator for creating parameterized tests.
|
||||
|
||||
See the module docstring for a usage example. The first element of
|
||||
@@ -348,7 +348,7 @@ class TestGeneratorMetaclass(type):
|
||||
up as tests by the unittest framework.
|
||||
|
||||
In general, it is supposed to be used in conjunction with the
|
||||
Parameters decorator.
|
||||
parameters decorator.
|
||||
"""
|
||||
|
||||
def __new__(mcs, class_name, bases, dct):
|
||||
@@ -385,8 +385,8 @@ def _UpdateClassDictForParamTestCase(dct, id_suffix, name, iterator):
|
||||
id_suffix[new_name] = getattr(func, '__x_extra_id__', '')
|
||||
|
||||
|
||||
class ParameterizedTestCase(unittest.TestCase):
|
||||
"""Base class for test cases using the Parameters decorator."""
|
||||
class TestCase(unittest.TestCase):
|
||||
"""Base class for test cases using the parameters decorator."""
|
||||
__metaclass__ = TestGeneratorMetaclass
|
||||
|
||||
def _OriginalName(self):
|
||||
@@ -409,10 +409,10 @@ class ParameterizedTestCase(unittest.TestCase):
|
||||
self._id_suffix.get(self._testMethodName, ''))
|
||||
|
||||
|
||||
def CoopParameterizedTestCase(other_base_class):
|
||||
def CoopTestCase(other_base_class):
|
||||
"""Returns a new base class with a cooperative metaclass base.
|
||||
|
||||
This enables the ParameterizedTestCase to be used in combination
|
||||
This enables the TestCase to be used in combination
|
||||
with other base classes that have custom metaclasses, such as
|
||||
mox.MoxTestBase.
|
||||
|
||||
@@ -425,7 +425,7 @@ def CoopParameterizedTestCase(other_base_class):
|
||||
|
||||
from google3.testing.pybase import parameterized
|
||||
|
||||
class ExampleTest(parameterized.CoopParameterizedTestCase(mox.MoxTestBase)):
|
||||
class ExampleTest(parameterized.CoopTestCase(mox.MoxTestBase)):
|
||||
...
|
||||
|
||||
Args:
|
||||
@@ -439,5 +439,5 @@ def CoopParameterizedTestCase(other_base_class):
|
||||
(other_base_class.__metaclass__,
|
||||
TestGeneratorMetaclass), {})
|
||||
return metaclass(
|
||||
'CoopParameterizedTestCase',
|
||||
(other_base_class, ParameterizedTestCase), {})
|
||||
'CoopTestCase',
|
||||
(other_base_class, TestCase), {})
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/any_test.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
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,])
|
||||
@@ -40,21 +40,21 @@ _TESTANY_MAPVALUEENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -77,28 +77,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTANY_MAPVALUEENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(10, 536870912), ],
|
||||
@@ -122,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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -131,12 +131,12 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -178,6 +178,5 @@ _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'))
|
||||
_TESTANY_MAPVALUEENTRY._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -66,10 +66,13 @@ if _api_version < 0: # Still unspecified?
|
||||
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.
|
||||
# TODO(b/74017912): It's unsafe to enable :use_fast_cpp_protos by default;
|
||||
# it can cause data loss if you have any Python-only extensions to any
|
||||
# message passed back and forth with C++ code.
|
||||
#
|
||||
# TODO(b/17427486): Once that bug is fixed, we want to make both Python 2
|
||||
# and Python 3 default to `_api_version = 2` (C++ implementation V2).
|
||||
pass
|
||||
|
||||
_default_implementation_type = (
|
||||
'python' if _api_version <= 0 else 'cpp')
|
||||
|
||||
@@ -549,10 +549,10 @@ class MessageMap(MutableMapping):
|
||||
self._values = {}
|
||||
|
||||
def __getitem__(self, key):
|
||||
key = self._key_checker.CheckValue(key)
|
||||
try:
|
||||
return self._values[key]
|
||||
except KeyError:
|
||||
key = self._key_checker.CheckValue(key)
|
||||
new_element = self._message_descriptor._concrete_class()
|
||||
new_element._SetListener(self._message_listener)
|
||||
self._values[key] = new_element
|
||||
@@ -584,12 +584,14 @@ class MessageMap(MutableMapping):
|
||||
return default
|
||||
|
||||
def __contains__(self, item):
|
||||
item = self._key_checker.CheckValue(item)
|
||||
return item in self._values
|
||||
|
||||
def __setitem__(self, key, value):
|
||||
raise ValueError('May not set values directly, call my_map[key].foo = 5')
|
||||
|
||||
def __delitem__(self, key):
|
||||
key = self._key_checker.CheckValue(key)
|
||||
del self._values[key]
|
||||
self._message_listener.Modified()
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import warnings
|
||||
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import descriptor_pb2
|
||||
@@ -98,6 +99,26 @@ class DescriptorDatabaseTest(unittest.TestCase):
|
||||
db.FindFileContainingSymbol,
|
||||
'protobuf_unittest.NoneMessage')
|
||||
|
||||
def testConflictRegister(self):
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
unittest_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb)
|
||||
db.Add(unittest_fd)
|
||||
conflict_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb)
|
||||
conflict_fd.name = 'other_file'
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
# Cause all warnings to always be triggered.
|
||||
warnings.simplefilter('always')
|
||||
db.Add(conflict_fd)
|
||||
self.assertTrue(len(w))
|
||||
self.assertIs(w[0].category, RuntimeWarning)
|
||||
self.assertIn('Conflict register for file "other_file": ',
|
||||
str(w[0].message))
|
||||
self.assertIn('already defined in file '
|
||||
'"google/protobuf/unittest.proto"',
|
||||
str(w[0].message))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -34,8 +34,10 @@
|
||||
|
||||
__author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
import copy
|
||||
import os
|
||||
import sys
|
||||
import warnings
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
@@ -119,6 +121,14 @@ class DescriptorPoolTestBase(object):
|
||||
self.assertEqual('google/protobuf/unittest.proto',
|
||||
file_desc5.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')
|
||||
assert descriptor_pool.Default().FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestService')
|
||||
|
||||
def testFindFileContainingSymbolFailure(self):
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindFileContainingSymbol('Does not exist')
|
||||
@@ -492,6 +502,52 @@ class DescriptorPoolTestBase(object):
|
||||
TEST1_FILE.CheckFile(self, self.pool)
|
||||
TEST2_FILE.CheckFile(self, self.pool)
|
||||
|
||||
def testConflictRegister(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
|
||||
unittest_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb)
|
||||
conflict_fd = copy.deepcopy(unittest_fd)
|
||||
conflict_fd.name = 'other_file'
|
||||
if api_implementation.Type() == 'cpp':
|
||||
try:
|
||||
self.pool.Add(unittest_fd)
|
||||
self.pool.Add(conflict_fd)
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
# Cause all warnings to always be triggered.
|
||||
warnings.simplefilter('always')
|
||||
pool = copy.deepcopy(self.pool)
|
||||
# No warnings to add the same descriptors.
|
||||
file_descriptor = unittest_pb2.DESCRIPTOR
|
||||
pool.AddDescriptor(
|
||||
file_descriptor.message_types_by_name['TestAllTypes'])
|
||||
pool.AddEnumDescriptor(
|
||||
file_descriptor.enum_types_by_name['ForeignEnum'])
|
||||
pool.AddServiceDescriptor(
|
||||
file_descriptor.services_by_name['TestService'])
|
||||
pool.AddExtensionDescriptor(
|
||||
file_descriptor.extensions_by_name['optional_int32_extension'])
|
||||
self.assertEqual(len(w), 0)
|
||||
# Check warnings for conflict descriptors with the same name.
|
||||
pool.Add(unittest_fd)
|
||||
pool.Add(conflict_fd)
|
||||
pool.FindFileByName(unittest_fd.name)
|
||||
pool.FindFileByName(conflict_fd.name)
|
||||
self.assertTrue(len(w))
|
||||
self.assertIs(w[0].category, RuntimeWarning)
|
||||
self.assertIn('Conflict register for file "other_file": ',
|
||||
str(w[0].message))
|
||||
self.assertIn('already defined in file '
|
||||
'"google/protobuf/unittest.proto"',
|
||||
str(w[0].message))
|
||||
|
||||
|
||||
class DefaultDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/descriptor_pool_test1.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n4google/protobuf/internal/descriptor_pool_test1.proto\x12\x1fgoogle.protobuf.python.internal\"\xfb\x05\n\x13\x44\x65scriptorPoolTest1\x12Z\n\x0bnested_enum\x18\x01 \x01(\x0e\x32?.google.protobuf.python.internal.DescriptorPoolTest1.NestedEnum:\x04\x42\x45TA\x12Z\n\x0enested_message\x18\x02 \x01(\x0b\x32\x42.google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage\x1a\xfd\x03\n\rNestedMessage\x12h\n\x0bnested_enum\x18\x01 \x01(\x0e\x32M.google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.NestedEnum:\x04ZETA\x12\x1a\n\x0cnested_field\x18\x02 \x01(\t:\x04\x62\x65ta\x12q\n\x13\x64\x65\x65p_nested_message\x18\x03 \x01(\x0b\x32T.google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage\x1a\xcd\x01\n\x11\x44\x65\x65pNestedMessage\x12y\n\x0bnested_enum\x18\x01 \x01(\x0e\x32_.google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage.NestedEnum:\x03\x45TA\x12\x1b\n\x0cnested_field\x18\x02 \x01(\t:\x05theta\" \n\nNestedEnum\x12\x07\n\x03\x45TA\x10\x07\x12\t\n\x05THETA\x10\x08\"#\n\nNestedEnum\x12\x0b\n\x07\x45PSILON\x10\x05\x12\x08\n\x04ZETA\x10\x06\"!\n\nNestedEnum\x12\t\n\x05\x41LPHA\x10\x01\x12\x08\n\x04\x42\x45TA\x10\x02*\t\x08\xe8\x07\x10\x80\x80\x80\x80\x02\"\xf1\x05\n\x13\x44\x65scriptorPoolTest2\x12[\n\x0bnested_enum\x18\x01 \x01(\x0e\x32?.google.protobuf.python.internal.DescriptorPoolTest2.NestedEnum:\x05GAMMA\x12Z\n\x0enested_message\x18\x02 \x01(\x0b\x32\x42.google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage\x1a\xfc\x03\n\rNestedMessage\x12h\n\x0bnested_enum\x18\x01 \x01(\x0e\x32M.google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.NestedEnum:\x04IOTA\x12\x1b\n\x0cnested_field\x18\x02 \x01(\t:\x05\x64\x65lta\x12q\n\x13\x64\x65\x65p_nested_message\x18\x03 \x01(\x0b\x32T.google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage\x1a\xcd\x01\n\x11\x44\x65\x65pNestedMessage\x12x\n\x0bnested_enum\x18\x01 \x01(\x0e\x32_.google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage.NestedEnum:\x02MU\x12\x1c\n\x0cnested_field\x18\x02 \x01(\t:\x06lambda\" \n\nNestedEnum\x12\n\n\x06LAMBDA\x10\x0b\x12\x06\n\x02MU\x10\x0c\"!\n\nNestedEnum\x12\x08\n\x04IOTA\x10\t\x12\t\n\x05KAPPA\x10\n\"\"\n\nNestedEnum\x12\t\n\x05GAMMA\x10\x03\x12\t\n\x05\x44\x45LTA\x10\x04')
|
||||
)
|
||||
|
||||
@@ -32,15 +32,15 @@ _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _descriptor.En
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ETA', index=0, number=7,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='THETA', index=1, number=8,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=738,
|
||||
serialized_end=770,
|
||||
)
|
||||
@@ -54,15 +54,15 @@ _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='EPSILON', index=0, number=5,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ZETA', index=1, number=6,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=772,
|
||||
serialized_end=807,
|
||||
)
|
||||
@@ -76,15 +76,15 @@ _DESCRIPTORPOOLTEST1_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ALPHA', index=0, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BETA', index=1, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=809,
|
||||
serialized_end=842,
|
||||
)
|
||||
@@ -98,15 +98,15 @@ _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _descriptor.En
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='LAMBDA', index=0, number=11,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='MU', index=1, number=12,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1506,
|
||||
serialized_end=1538,
|
||||
)
|
||||
@@ -120,15 +120,15 @@ _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='IOTA', index=0, number=9,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='KAPPA', index=1, number=10,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1540,
|
||||
serialized_end=1573,
|
||||
)
|
||||
@@ -142,15 +142,15 @@ _DESCRIPTORPOOLTEST2_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='GAMMA', index=0, number=3,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='DELTA', index=1, number=4,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1575,
|
||||
serialized_end=1609,
|
||||
)
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -185,7 +185,7 @@ _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -230,7 +230,7 @@ _DESCRIPTORPOOLTEST1_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -268,7 +268,7 @@ _DESCRIPTORPOOLTEST1 = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1000, 536870912), ],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -307,7 +307,7 @@ _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -352,7 +352,7 @@ _DESCRIPTORPOOLTEST2_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -390,7 +390,7 @@ _DESCRIPTORPOOLTEST2 = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -22,6 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/descriptor_pool_test2.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n4google/protobuf/internal/descriptor_pool_test2.proto\x12\x1fgoogle.protobuf.python.internal\x1a\x34google/protobuf/internal/descriptor_pool_test1.proto\x1a,google/protobuf/internal/more_messages.proto\"\xef\x06\n\x13\x44\x65scriptorPoolTest3\x12X\n\x0bnested_enum\x18\x01 \x01(\x0e\x32?.google.protobuf.python.internal.DescriptorPoolTest3.NestedEnum:\x02XI\x12Z\n\x0enested_message\x18\x02 \x01(\x0b\x32\x42.google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage\x1a\xf7\x03\n\rNestedMessage\x12\x66\n\x0bnested_enum\x18\x01 \x01(\x0e\x32M.google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.NestedEnum:\x02PI\x12\x18\n\x0cnested_field\x18\x02 \x01(\t:\x02nu\x12q\n\x13\x64\x65\x65p_nested_message\x18\x03 \x01(\x0b\x32T.google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage\x1a\xcd\x01\n\x11\x44\x65\x65pNestedMessage\x12y\n\x0bnested_enum\x18\x01 \x01(\x0e\x32_.google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage.NestedEnum:\x03RHO\x12\x1b\n\x0cnested_field\x18\x02 \x01(\t:\x05sigma\" \n\nNestedEnum\x12\x07\n\x03RHO\x10\x11\x12\t\n\x05SIGMA\x10\x12\"!\n\nNestedEnum\x12\x0b\n\x07OMICRON\x10\x0f\x12\x06\n\x02PI\x10\x10\"\x1c\n\nNestedEnum\x12\x06\n\x02NU\x10\r\x12\x06\n\x02XI\x10\x0e\x32\x89\x01\n\x14\x64\x65scriptor_pool_test\x12\x34.google.protobuf.python.internal.DescriptorPoolTest1\x18\xe9\x07 \x01(\x0b\x32\x34.google.protobuf.python.internal.DescriptorPoolTest3P\x01')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_internal_dot_descriptor__pool__test1__pb2.DESCRIPTOR,google_dot_protobuf_dot_internal_dot_more__messages__pb2.DESCRIPTOR,],
|
||||
@@ -37,15 +37,15 @@ _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _descriptor.En
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='RHO', index=0, number=17,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='SIGMA', index=1, number=18,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=832,
|
||||
serialized_end=864,
|
||||
)
|
||||
@@ -59,15 +59,15 @@ _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='OMICRON', index=0, number=15,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='PI', index=1, number=16,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=866,
|
||||
serialized_end=899,
|
||||
)
|
||||
@@ -81,15 +81,15 @@ _DESCRIPTORPOOLTEST3_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NU', index=0, number=13,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='XI', index=1, number=14,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=901,
|
||||
serialized_end=929,
|
||||
)
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -124,7 +124,7 @@ _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -169,7 +169,7 @@ _DESCRIPTORPOOLTEST3_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -208,13 +208,13 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST3_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -742,6 +742,19 @@ class DescriptorCopyToProtoTest(unittest.TestCase):
|
||||
deprecated: true
|
||||
>
|
||||
>
|
||||
field {
|
||||
name: "deprecated_int32_in_oneof"
|
||||
number: 2
|
||||
label: LABEL_OPTIONAL
|
||||
type: TYPE_INT32
|
||||
options {
|
||||
deprecated: true
|
||||
}
|
||||
oneof_index: 0
|
||||
}
|
||||
oneof_decl {
|
||||
name: "oneof_fields"
|
||||
}
|
||||
"""
|
||||
|
||||
self._InternalTestCopyToProto(
|
||||
|
||||
@@ -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, unused_deterministic):
|
||||
def EncodeVarint(write, value, unused_deterministic=None):
|
||||
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, unused_deterministic):
|
||||
def EncodeSignedVarint(write, value, unused_deterministic=None):
|
||||
if value < 0:
|
||||
value += (1 << 64)
|
||||
bits = value & 0x7f
|
||||
@@ -418,7 +418,8 @@ def _VarintBytes(value):
|
||||
def TagBytes(field_number, wire_type):
|
||||
"""Encode the given tag and return the bytes. Only called at startup."""
|
||||
|
||||
return six.binary_type( _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
|
||||
@@ -523,14 +524,14 @@ def _StructPackEncoder(wire_type, format):
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeRepeatedField(write, value, unused_deterministic):
|
||||
def EncodeRepeatedField(write, value, unused_deterministic=None):
|
||||
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, unused_deterministic):
|
||||
def EncodeField(write, value, unused_deterministic=None):
|
||||
write(tag_bytes)
|
||||
return write(local_struct_pack(format, value))
|
||||
return EncodeField
|
||||
@@ -594,7 +595,7 @@ def _FloatingPointEncoder(wire_type, format):
|
||||
return EncodePackedField
|
||||
elif is_repeated:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeRepeatedField(write, value, unused_deterministic):
|
||||
def EncodeRepeatedField(write, value, unused_deterministic=None):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
try:
|
||||
@@ -604,7 +605,7 @@ def _FloatingPointEncoder(wire_type, format):
|
||||
return EncodeRepeatedField
|
||||
else:
|
||||
tag_bytes = TagBytes(field_number, wire_type)
|
||||
def EncodeField(write, value, unused_deterministic):
|
||||
def EncodeField(write, value, unused_deterministic=None):
|
||||
write(tag_bytes)
|
||||
try:
|
||||
write(local_struct_pack(format, value))
|
||||
@@ -661,7 +662,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, unused_deterministic):
|
||||
def EncodeRepeatedField(write, value, unused_deterministic=None):
|
||||
for element in value:
|
||||
write(tag_bytes)
|
||||
if element:
|
||||
@@ -671,7 +672,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, unused_deterministic):
|
||||
def EncodeField(write, value, unused_deterministic=None):
|
||||
write(tag_bytes)
|
||||
if value:
|
||||
return write(true_byte)
|
||||
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/factory_test1.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n,google/protobuf/internal/factory_test1.proto\x12\x1fgoogle.protobuf.python.internal\"\xd5\x03\n\x0f\x46\x61\x63tory1Message\x12\x45\n\x0e\x66\x61\x63tory_1_enum\x18\x01 \x01(\x0e\x32-.google.protobuf.python.internal.Factory1Enum\x12\x62\n\x15nested_factory_1_enum\x18\x02 \x01(\x0e\x32\x43.google.protobuf.python.internal.Factory1Message.NestedFactory1Enum\x12h\n\x18nested_factory_1_message\x18\x03 \x01(\x0b\x32\x46.google.protobuf.python.internal.Factory1Message.NestedFactory1Message\x12\x14\n\x0cscalar_value\x18\x04 \x01(\x05\x12\x12\n\nlist_value\x18\x05 \x03(\t\x1a&\n\x15NestedFactory1Message\x12\r\n\x05value\x18\x01 \x01(\t\"P\n\x12NestedFactory1Enum\x12\x1c\n\x18NESTED_FACTORY_1_VALUE_0\x10\x00\x12\x1c\n\x18NESTED_FACTORY_1_VALUE_1\x10\x01*\t\x08\xe8\x07\x10\x80\x80\x80\x80\x02*<\n\x0c\x46\x61\x63tory1Enum\x12\x15\n\x11\x46\x41\x43TORY_1_VALUE_0\x10\x00\x12\x15\n\x11\x46\x41\x43TORY_1_VALUE_1\x10\x01')
|
||||
)
|
||||
|
||||
@@ -31,15 +31,15 @@ _FACTORY1ENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_1_VALUE_0', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_1_VALUE_1', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=553,
|
||||
serialized_end=613,
|
||||
)
|
||||
@@ -58,15 +58,15 @@ _FACTORY1MESSAGE_NESTEDFACTORY1ENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_1_VALUE_0', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_1_VALUE_1', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=460,
|
||||
serialized_end=540,
|
||||
)
|
||||
@@ -86,14 +86,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -152,7 +152,7 @@ _FACTORY1MESSAGE = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1000, 536870912), ],
|
||||
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -21,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/factory_test2.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
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,])
|
||||
@@ -33,15 +33,15 @@ _FACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_2_VALUE_0', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_2_VALUE_1', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1816,
|
||||
serialized_end=1876,
|
||||
)
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedFactory2Enum',
|
||||
@@ -68,15 +68,15 @@ _FACTORY2MESSAGE_NESTEDFACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_2_VALUE_0', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_2_VALUE_1', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1454,
|
||||
serialized_end=1534,
|
||||
)
|
||||
@@ -90,11 +90,11 @@ _MESSAGEWITHNESTEDENUMONLY_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_MESSAGE_ENUM_0', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1734,
|
||||
serialized_end=1773,
|
||||
)
|
||||
@@ -114,14 +114,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -144,21 +144,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -330,13 +330,13 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE, _FACTORY2MESSAGE_GROUPED, ],
|
||||
enum_types=[
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -363,14 +363,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -395,7 +395,7 @@ _MESSAGEWITHNESTEDENUMONLY = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -419,14 +419,14 @@ _MESSAGEWITHOPTION = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\020\001')),
|
||||
serialized_options=_b('\020\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -513,6 +513,5 @@ _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'))
|
||||
_MESSAGEWITHOPTION._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/file_options_test.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n0google/protobuf/internal/file_options_test.proto\x12\x1fgoogle.protobuf.python.internal\x1a google/protobuf/descriptor.proto\"\x1e\n\nFooOptions\x12\x10\n\x08\x66oo_name\x18\x01 \x01(\t:a\n\x0b\x66oo_options\x12\x1c.google.protobuf.FileOptions\x18\xac\xec\xb6\x39 \x01(\x0b\x32+.google.protobuf.python.internal.FooOptions')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,])
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_FOOOPTIONS = _descriptor.Descriptor(
|
||||
@@ -48,14 +48,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/import_test_package/inner.proto',
|
||||
package='google.protobuf.python.internal.import_test_package',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n8google/protobuf/internal/import_test_package/inner.proto\x12\x33google.protobuf.python.internal.import_test_package\"\x1a\n\x05Inner\x12\x11\n\x05value\x18\x01 \x01(\x05:\x02\x35\x37')
|
||||
)
|
||||
|
||||
@@ -38,14 +38,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/import_test_package/outer.proto',
|
||||
package='google.protobuf.python.internal.import_test_package',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n8google/protobuf/internal/import_test_package/outer.proto\x12\x33google.protobuf.python.internal.import_test_package\x1a\x38google/protobuf/internal/import_test_package/inner.proto\"R\n\x05Outer\x12I\n\x05inner\x18\x01 \x01(\x0b\x32:.google.protobuf.python.internal.import_test_package.Inner')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_internal_dot_import__test__package_dot_inner__pb2.DESCRIPTOR,])
|
||||
@@ -40,14 +40,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -983,6 +983,18 @@ class JsonFormatTest(JsonFormatBase):
|
||||
self.assertEqual('{\n"int32Value": 12345\n}',
|
||||
json_format.MessageToJson(message, indent=0))
|
||||
|
||||
def testFormatEnumsAsInts(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
message.enum_value = json_format_proto3_pb2.BAR
|
||||
message.repeated_enum_value.append(json_format_proto3_pb2.FOO)
|
||||
message.repeated_enum_value.append(json_format_proto3_pb2.BAR)
|
||||
self.assertEqual(json.loads('{\n'
|
||||
' "enumValue": 1,\n'
|
||||
' "repeatedEnumValue": [0, 1]\n'
|
||||
'}\n'),
|
||||
json.loads(json_format.MessageToJson(
|
||||
message, use_integers_for_enums=True)))
|
||||
|
||||
def testParseDict(self):
|
||||
expected = 12345
|
||||
js_dict = {'int32Value': expected}
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/message_set_extensions.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n5google/protobuf/internal/message_set_extensions.proto\x12\x18google.protobuf.internal\"\x1e\n\x0eTestMessageSet*\x08\x08\x04\x10\xff\xff\xff\xff\x07:\x02\x08\x01\"\xa5\x01\n\x18TestMessageSetExtension1\x12\t\n\x01i\x18\x0f \x01(\x05\x32~\n\x15message_set_extension\x12(.google.protobuf.internal.TestMessageSet\x18\xab\xff\xf6. \x01(\x0b\x32\x32.google.protobuf.internal.TestMessageSetExtension1\"\xa7\x01\n\x18TestMessageSetExtension2\x12\x0b\n\x03str\x18\x19 \x01(\t2~\n\x15message_set_extension\x12(.google.protobuf.internal.TestMessageSet\x18\xca\xff\xf6. \x01(\x0b\x32\x32.google.protobuf.internal.TestMessageSetExtension2\"(\n\x18TestMessageSetExtension3\x12\x0c\n\x04text\x18# \x01(\t:\x7f\n\x16message_set_extension3\x12(.google.protobuf.internal.TestMessageSet\x18\xdf\xff\xf6. \x01(\x0b\x32\x32.google.protobuf.internal.TestMessageSetExtension3')
|
||||
)
|
||||
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTMESSAGESET = _descriptor.Descriptor(
|
||||
@@ -46,7 +46,7 @@ _TESTMESSAGESET = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\010\001')),
|
||||
serialized_options=_b('\010\001'),
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(4, 2147483647), ],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -79,12 +79,12 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -117,12 +117,12 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -146,14 +146,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -205,6 +205,5 @@ TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION1.extensions_by_name['m
|
||||
_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'].message_type = _TESTMESSAGESETEXTENSION2
|
||||
TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'])
|
||||
|
||||
_TESTMESSAGESET.has_options = True
|
||||
_TESTMESSAGESET._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\010\001'))
|
||||
_TESTMESSAGESET._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -99,7 +99,7 @@ def IsNegInf(val):
|
||||
BaseTestCase = testing_refleaks.BaseTestCase
|
||||
|
||||
|
||||
@_parameterized.NamedParameters(
|
||||
@_parameterized.named_parameters(
|
||||
('_proto2', unittest_pb2),
|
||||
('_proto3', unittest_proto3_arena_pb2))
|
||||
class MessageTest(BaseTestCase):
|
||||
@@ -1480,12 +1480,8 @@ class Proto3Test(BaseTestCase):
|
||||
|
||||
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(''))
|
||||
with self.assertRaises(TypeError):
|
||||
msg.map_int32_foreign_message.get('')
|
||||
|
||||
def testScalarMap(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
@@ -1695,12 +1691,35 @@ 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['']
|
||||
with self.assertRaises(TypeError):
|
||||
del msg2.map_int32_foreign_message['']
|
||||
|
||||
def testMapMergeFrom(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_int32_int32[12] = 34
|
||||
msg.map_int32_int32[56] = 78
|
||||
msg.map_int64_int64[22] = 33
|
||||
msg.map_int32_foreign_message[111].c = 5
|
||||
msg.map_int32_foreign_message[222].c = 10
|
||||
|
||||
msg2 = map_unittest_pb2.TestMap()
|
||||
msg2.map_int32_int32[12] = 55
|
||||
msg2.map_int64_int64[88] = 99
|
||||
msg2.map_int32_foreign_message[222].c = 15
|
||||
msg2.map_int32_foreign_message[222].d = 20
|
||||
|
||||
msg2.map_int32_int32.MergeFrom(msg.map_int32_int32)
|
||||
self.assertEqual(34, msg2.map_int32_int32[12])
|
||||
self.assertEqual(78, msg2.map_int32_int32[56])
|
||||
|
||||
msg2.map_int64_int64.MergeFrom(msg.map_int64_int64)
|
||||
self.assertEqual(33, msg2.map_int64_int64[22])
|
||||
self.assertEqual(99, msg2.map_int64_int64[88])
|
||||
|
||||
msg2.map_int32_foreign_message.MergeFrom(msg.map_int32_foreign_message)
|
||||
self.assertEqual(5, msg2.map_int32_foreign_message[111].c)
|
||||
self.assertEqual(10, msg2.map_int32_foreign_message[222].c)
|
||||
self.assertFalse(msg2.map_int32_foreign_message[222].HasField('d'))
|
||||
|
||||
def testMergeFromBadType(self):
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/missing_enum_values.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n2google/protobuf/internal/missing_enum_values.proto\x12\x1fgoogle.protobuf.python.internal\"\xc1\x02\n\x0eTestEnumValues\x12X\n\x14optional_nested_enum\x18\x01 \x01(\x0e\x32:.google.protobuf.python.internal.TestEnumValues.NestedEnum\x12X\n\x14repeated_nested_enum\x18\x02 \x03(\x0e\x32:.google.protobuf.python.internal.TestEnumValues.NestedEnum\x12Z\n\x12packed_nested_enum\x18\x03 \x03(\x0e\x32:.google.protobuf.python.internal.TestEnumValues.NestedEnumB\x02\x10\x01\"\x1f\n\nNestedEnum\x12\x08\n\x04ZERO\x10\x00\x12\x07\n\x03ONE\x10\x01\"\xd3\x02\n\x15TestMissingEnumValues\x12_\n\x14optional_nested_enum\x18\x01 \x01(\x0e\x32\x41.google.protobuf.python.internal.TestMissingEnumValues.NestedEnum\x12_\n\x14repeated_nested_enum\x18\x02 \x03(\x0e\x32\x41.google.protobuf.python.internal.TestMissingEnumValues.NestedEnum\x12\x61\n\x12packed_nested_enum\x18\x03 \x03(\x0e\x32\x41.google.protobuf.python.internal.TestMissingEnumValues.NestedEnumB\x02\x10\x01\"\x15\n\nNestedEnum\x12\x07\n\x03TWO\x10\x02\"\x1b\n\nJustString\x12\r\n\x05\x64ummy\x18\x01 \x02(\t')
|
||||
)
|
||||
|
||||
@@ -32,15 +32,15 @@ _TESTENUMVALUES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ZERO', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ONE', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=378,
|
||||
serialized_end=409,
|
||||
)
|
||||
@@ -54,11 +54,11 @@ _TESTMISSINGENUMVALUES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TWO', index=0, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=730,
|
||||
serialized_end=751,
|
||||
)
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_b('\020\001'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -100,7 +100,7 @@ _TESTENUMVALUES = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_TESTENUMVALUES_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_b('\020\001'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -146,7 +146,7 @@ _TESTMISSINGENUMVALUES = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -170,14 +170,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -222,8 +222,6 @@ JustString = _reflection.GeneratedProtocolMessageType('JustString', (_message.Me
|
||||
_sym_db.RegisterMessage(JustString)
|
||||
|
||||
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum'].has_options = True
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum'].has_options = True
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum']._options = None
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum']._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/more_extensions_dynamic.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
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, file=DESCRIPTOR)
|
||||
serialized_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,7 @@ 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, file=DESCRIPTOR)
|
||||
serialized_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,
|
||||
@@ -48,7 +48,7 @@ repeated_dynamic_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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_DYNAMICMESSAGETYPE = _descriptor.Descriptor(
|
||||
@@ -64,14 +64,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/more_extensions.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n.google/protobuf/internal/more_extensions.proto\x12\x18google.protobuf.internal\"P\n\x0fTopLevelMessage\x12=\n\nsubmessage\x18\x01 \x01(\x0b\x32).google.protobuf.internal.ExtendedMessage\"\x1b\n\x0f\x45xtendedMessage*\x08\x08\x01\x10\x80\x80\x80\x80\x02\"-\n\x0e\x46oreignMessage\x12\x1b\n\x13\x66oreign_message_int\x18\x01 \x01(\x05:I\n\x16optional_int_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x01 \x01(\x05:w\n\x1aoptional_message_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x02 \x01(\x0b\x32(.google.protobuf.internal.ForeignMessage:I\n\x16repeated_int_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x03 \x03(\x05:w\n\x1arepeated_message_extension\x12).google.protobuf.internal.ExtendedMessage\x18\x04 \x03(\x0b\x32(.google.protobuf.internal.ForeignMessage')
|
||||
)
|
||||
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TOPLEVELMESSAGE = _descriptor.Descriptor(
|
||||
@@ -70,14 +70,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -101,7 +101,7 @@ _EXTENDEDMESSAGE = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1, 536870912), ],
|
||||
@@ -125,14 +125,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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/more_messages.proto',
|
||||
package='google.protobuf.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n,google/protobuf/internal/more_messages.proto\x12\x18google.protobuf.internal\"h\n\x10OutOfOrderFields\x12\x17\n\x0foptional_sint32\x18\x05 \x01(\x11\x12\x17\n\x0foptional_uint32\x18\x03 \x01(\r\x12\x16\n\x0eoptional_int32\x18\x01 \x01(\x05*\x04\x08\x04\x10\x05*\x04\x08\x02\x10\x03:C\n\x0foptional_uint64\x12*.google.protobuf.internal.OutOfOrderFields\x18\x04 \x01(\x04:B\n\x0eoptional_int64\x12*.google.protobuf.internal.OutOfOrderFields\x18\x02 \x01(\x03')
|
||||
)
|
||||
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_OUTOFORDERFIELDS = _descriptor.Descriptor(
|
||||
@@ -54,28 +54,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(4, 5), (2, 3), ],
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
syntax = "proto2";
|
||||
|
||||
enum NoPackageEnum {
|
||||
NO_PACKAGE_VALUE_0 = 0;
|
||||
NO_PACKAGE_VALUE_1 = 1;
|
||||
}
|
||||
|
||||
message NoPackageMessage {
|
||||
optional NoPackageEnum no_package_enum = 1;
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/no_package.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
from google.protobuf.internal import enum_type_wrapper
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
|
||||
DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/no_package.proto',
|
||||
package='',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n)google/protobuf/internal/no_package.proto\";\n\x10NoPackageMessage\x12\'\n\x0fno_package_enum\x18\x01 \x01(\x0e\x32\x0e.NoPackageEnum*?\n\rNoPackageEnum\x12\x16\n\x12NO_PACKAGE_VALUE_0\x10\x00\x12\x16\n\x12NO_PACKAGE_VALUE_1\x10\x01')
|
||||
)
|
||||
|
||||
_NOPACKAGEENUM = _descriptor.EnumDescriptor(
|
||||
name='NoPackageEnum',
|
||||
full_name='NoPackageEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NO_PACKAGE_VALUE_0', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NO_PACKAGE_VALUE_1', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=106,
|
||||
serialized_end=169,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_NOPACKAGEENUM)
|
||||
|
||||
NoPackageEnum = enum_type_wrapper.EnumTypeWrapper(_NOPACKAGEENUM)
|
||||
NO_PACKAGE_VALUE_0 = 0
|
||||
NO_PACKAGE_VALUE_1 = 1
|
||||
|
||||
|
||||
|
||||
_NOPACKAGEMESSAGE = _descriptor.Descriptor(
|
||||
name='NoPackageMessage',
|
||||
full_name='NoPackageMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='no_package_enum', full_name='NoPackageMessage.no_package_enum', index=0,
|
||||
number=1, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=45,
|
||||
serialized_end=104,
|
||||
)
|
||||
|
||||
_NOPACKAGEMESSAGE.fields_by_name['no_package_enum'].enum_type = _NOPACKAGEENUM
|
||||
DESCRIPTOR.message_types_by_name['NoPackageMessage'] = _NOPACKAGEMESSAGE
|
||||
DESCRIPTOR.enum_types_by_name['NoPackageEnum'] = _NOPACKAGEENUM
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
NoPackageMessage = _reflection.GeneratedProtocolMessageType('NoPackageMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _NOPACKAGEMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.no_package_pb2'
|
||||
# @@protoc_insertion_point(class_scope:NoPackageMessage)
|
||||
))
|
||||
_sym_db.RegisterMessage(NoPackageMessage)
|
||||
|
||||
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/packed_field_test.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto3',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n0google/protobuf/internal/packed_field_test.proto\x12\x1fgoogle.protobuf.python.internal\"\xdb\x03\n\x0fTestPackedTypes\x12\x16\n\x0erepeated_int32\x18\x01 \x03(\x05\x12\x16\n\x0erepeated_int64\x18\x02 \x03(\x03\x12\x17\n\x0frepeated_uint32\x18\x03 \x03(\r\x12\x17\n\x0frepeated_uint64\x18\x04 \x03(\x04\x12\x17\n\x0frepeated_sint32\x18\x05 \x03(\x11\x12\x17\n\x0frepeated_sint64\x18\x06 \x03(\x12\x12\x18\n\x10repeated_fixed32\x18\x07 \x03(\x07\x12\x18\n\x10repeated_fixed64\x18\x08 \x03(\x06\x12\x19\n\x11repeated_sfixed32\x18\t \x03(\x0f\x12\x19\n\x11repeated_sfixed64\x18\n \x03(\x10\x12\x16\n\x0erepeated_float\x18\x0b \x03(\x02\x12\x17\n\x0frepeated_double\x18\x0c \x03(\x01\x12\x15\n\rrepeated_bool\x18\r \x03(\x08\x12Y\n\x14repeated_nested_enum\x18\x0e \x03(\x0e\x32;.google.protobuf.python.internal.TestPackedTypes.NestedEnum\"\'\n\nNestedEnum\x12\x07\n\x03\x46OO\x10\x00\x12\x07\n\x03\x42\x41R\x10\x01\x12\x07\n\x03\x42\x41Z\x10\x02\"\xec\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\x1c\n\x10repeated_fixed32\x18\x07 \x03(\x07\x42\x02\x10\x00\x12\x1c\n\x10repeated_fixed64\x18\x08 \x03(\x06\x42\x02\x10\x00\x12\x1d\n\x11repeated_sfixed32\x18\t \x03(\x0f\x42\x02\x10\x00\x12\x1d\n\x11repeated_sfixed64\x18\n \x03(\x10\x42\x02\x10\x00\x12\x1a\n\x0erepeated_float\x18\x0b \x03(\x02\x42\x02\x10\x00\x12\x1b\n\x0frepeated_double\x18\x0c \x03(\x01\x42\x02\x10\x00\x12\x19\n\rrepeated_bool\x18\r \x03(\x08\x42\x02\x10\x00\x12]\n\x14repeated_nested_enum\x18\x0e \x03(\x0e\x32;.google.protobuf.python.internal.TestPackedTypes.NestedEnumB\x02\x10\x00\x62\x06proto3')
|
||||
)
|
||||
|
||||
@@ -32,19 +32,19 @@ _TESTPACKEDTYPES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOO', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAR', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAZ', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=522,
|
||||
serialized_end=561,
|
||||
)
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -163,7 +163,7 @@ _TESTPACKEDTYPES = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_TESTPACKEDTYPES_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -187,105 +187,105 @@ _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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_b('\020\000'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -317,32 +317,18 @@ TestUnpackedTypes = _reflection.GeneratedProtocolMessageType('TestUnpackedTypes'
|
||||
_sym_db.RegisterMessage(TestUnpackedTypes)
|
||||
|
||||
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum']._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -9,7 +9,6 @@ from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import service as _service
|
||||
from google.protobuf import service_reflection
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -21,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/internal/test_bad_identifiers.proto',
|
||||
package='protobuf_unittest',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('\220\001\001'),
|
||||
serialized_pb=_b('\n3google/protobuf/internal/test_bad_identifiers.proto\x12\x11protobuf_unittest\"\x1e\n\x12TestBadIdentifiers*\x08\x08\x64\x10\x80\x80\x80\x80\x02\"\x10\n\x0e\x41notherMessage2\x10\n\x0e\x41notherService:;\n\x07message\x12%.protobuf_unittest.TestBadIdentifiers\x18\x64 \x01(\t:\x03\x66oo:>\n\ndescriptor\x12%.protobuf_unittest.TestBadIdentifiers\x18\x65 \x01(\t:\x03\x62\x61r:>\n\nreflection\x12%.protobuf_unittest.TestBadIdentifiers\x18\x66 \x01(\t:\x03\x62\x61z:;\n\x07service\x12%.protobuf_unittest.TestBadIdentifiers\x18g \x01(\t:\x03quxB\x03\x90\x01\x01')
|
||||
)
|
||||
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTBADIDENTIFIERS = _descriptor.Descriptor(
|
||||
@@ -72,7 +72,7 @@ _TESTBADIDENTIFIERS = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(100, 536870912), ],
|
||||
@@ -96,7 +96,7 @@ _ANOTHERMESSAGE = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -133,15 +133,14 @@ TestBadIdentifiers.RegisterExtension(descriptor)
|
||||
TestBadIdentifiers.RegisterExtension(reflection)
|
||||
TestBadIdentifiers.RegisterExtension(service)
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\220\001\001'))
|
||||
DESCRIPTOR._options = None
|
||||
|
||||
_ANOTHERSERVICE = _descriptor.ServiceDescriptor(
|
||||
name='AnotherService',
|
||||
full_name='protobuf_unittest.AnotherService',
|
||||
file=DESCRIPTOR,
|
||||
index=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=124,
|
||||
serialized_end=140,
|
||||
methods=[
|
||||
|
||||
@@ -48,6 +48,7 @@ except ImportError:
|
||||
|
||||
from google.protobuf.internal import _parameterized
|
||||
|
||||
from google.protobuf import any_pb2
|
||||
from google.protobuf import any_test_pb2
|
||||
from google.protobuf import map_unittest_pb2
|
||||
from google.protobuf import unittest_mset_pb2
|
||||
@@ -99,7 +100,7 @@ class TextFormatBase(unittest.TestCase):
|
||||
return text
|
||||
|
||||
|
||||
@_parameterized.Parameters((unittest_pb2), (unittest_proto3_arena_pb2))
|
||||
@_parameterized.parameters((unittest_pb2), (unittest_proto3_arena_pb2))
|
||||
class TextFormatTest(TextFormatBase):
|
||||
|
||||
def testPrintExotic(self, message_module):
|
||||
@@ -369,6 +370,7 @@ class TextFormatTest(TextFormatBase):
|
||||
def testParseRepeatedScalarShortFormat(self, message_module):
|
||||
message = message_module.TestAllTypes()
|
||||
text = ('repeated_int64: [100, 200];\n'
|
||||
'repeated_int64: []\n'
|
||||
'repeated_int64: 300,\n'
|
||||
'repeated_string: ["one", "two"];\n')
|
||||
text_format.Parse(text, message)
|
||||
@@ -524,20 +526,68 @@ class OnlyWorksWithProto2RightNowTests(TextFormatBase):
|
||||
|
||||
def testPrintInIndexOrder(self):
|
||||
message = unittest_pb2.TestFieldOrderings()
|
||||
message.my_string = '115'
|
||||
# Fields are listed in index order instead of field number.
|
||||
message.my_string = 'str'
|
||||
message.my_int = 101
|
||||
message.my_float = 111
|
||||
message.optional_nested_message.oo = 0
|
||||
message.optional_nested_message.bb = 1
|
||||
message.Extensions[unittest_pb2.my_extension_string] = 'ext_str0'
|
||||
# Extensions are listed based on the order of extension number.
|
||||
# Extension number 12.
|
||||
message.Extensions[unittest_pb2.TestExtensionOrderings2.
|
||||
test_ext_orderings2].my_string = 'ext_str2'
|
||||
# Extension number 13.
|
||||
message.Extensions[unittest_pb2.TestExtensionOrderings1.
|
||||
test_ext_orderings1].my_string = 'ext_str1'
|
||||
# Extension number 14.
|
||||
message.Extensions[
|
||||
unittest_pb2.TestExtensionOrderings2.TestExtensionOrderings3.
|
||||
test_ext_orderings3].my_string = 'ext_str3'
|
||||
|
||||
# Print in index order.
|
||||
self.CompareToGoldenText(
|
||||
self.RemoveRedundantZeros(text_format.MessageToString(
|
||||
message, use_index_order=True)),
|
||||
'my_string: \"115\"\nmy_int: 101\nmy_float: 111\n'
|
||||
'optional_nested_message {\n oo: 0\n bb: 1\n}\n')
|
||||
self.RemoveRedundantZeros(
|
||||
text_format.MessageToString(message, use_index_order=True)),
|
||||
'my_string: "str"\n'
|
||||
'my_int: 101\n'
|
||||
'my_float: 111\n'
|
||||
'optional_nested_message {\n'
|
||||
' oo: 0\n'
|
||||
' bb: 1\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] {\n'
|
||||
' my_string: "ext_str2"\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1] {\n'
|
||||
' my_string: "ext_str1"\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3'
|
||||
'.test_ext_orderings3] {\n'
|
||||
' my_string: "ext_str3"\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.my_extension_string]: "ext_str0"\n')
|
||||
# By default, print in field number order.
|
||||
self.CompareToGoldenText(
|
||||
self.RemoveRedundantZeros(text_format.MessageToString(message)),
|
||||
'my_int: 101\nmy_string: \"115\"\nmy_float: 111\n'
|
||||
'optional_nested_message {\n bb: 1\n oo: 0\n}\n')
|
||||
'my_int: 101\n'
|
||||
'my_string: "str"\n'
|
||||
'[protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] {\n'
|
||||
' my_string: "ext_str2"\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1] {\n'
|
||||
' my_string: "ext_str1"\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3'
|
||||
'.test_ext_orderings3] {\n'
|
||||
' my_string: "ext_str3"\n'
|
||||
'}\n'
|
||||
'[protobuf_unittest.my_extension_string]: "ext_str0"\n'
|
||||
'my_float: 111\n'
|
||||
'optional_nested_message {\n'
|
||||
' bb: 1\n'
|
||||
' oo: 0\n'
|
||||
'}\n')
|
||||
|
||||
def testMergeLinesGolden(self):
|
||||
opened = self.ReadGolden('text_format_unittest_data_oneof_implemented.txt')
|
||||
@@ -828,6 +878,10 @@ class Proto2Tests(TextFormatBase):
|
||||
' }\n'
|
||||
' }\n'
|
||||
' [unknown_extension]: 5\n'
|
||||
' [unknown_extension_with_number_field] {\n'
|
||||
' 1: "some_field"\n'
|
||||
' 2: -0.451\n'
|
||||
' }\n'
|
||||
'}\n')
|
||||
text_format.Parse(text, message, allow_unknown_extension=True)
|
||||
golden = 'message_set {\n}\n'
|
||||
@@ -894,7 +948,6 @@ class Proto2Tests(TextFormatBase):
|
||||
message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
malformed = ('message_set {\n'
|
||||
' unknown_field: true\n'
|
||||
' \n' # Missing '>' here.
|
||||
'}\n')
|
||||
six.assertRaisesRegex(self,
|
||||
text_format.ParseError,
|
||||
@@ -906,7 +959,7 @@ class Proto2Tests(TextFormatBase):
|
||||
message,
|
||||
allow_unknown_extension=True)
|
||||
|
||||
# Parse known extension correcty.
|
||||
# Parse known extension correctly.
|
||||
message = unittest_mset_pb2.TestMessageSetContainer()
|
||||
text = ('message_set {\n'
|
||||
' [protobuf_unittest.TestMessageSetExtension1] {\n'
|
||||
@@ -967,15 +1020,26 @@ class Proto2Tests(TextFormatBase):
|
||||
'"protobuf_unittest.optional_int32_extension" extensions.'),
|
||||
text_format.Parse, text, message)
|
||||
|
||||
def testParseDuplicateNestedMessageScalars(self):
|
||||
def testParseDuplicateMessages(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
text = ('optional_nested_message { bb: 1 } '
|
||||
'optional_nested_message { bb: 2 }')
|
||||
six.assertRaisesRegex(self, text_format.ParseError, (
|
||||
'1:65 : Message type "protobuf_unittest.TestAllTypes.NestedMessage" '
|
||||
'should not have multiple "bb" fields.'), text_format.Parse, text,
|
||||
'1:59 : Message type "protobuf_unittest.TestAllTypes" '
|
||||
'should not have multiple "optional_nested_message" fields.'),
|
||||
text_format.Parse, text,
|
||||
message)
|
||||
|
||||
def testParseDuplicateExtensionMessages(self):
|
||||
message = unittest_pb2.TestAllExtensions()
|
||||
text = ('[protobuf_unittest.optional_nested_message_extension]: {} '
|
||||
'[protobuf_unittest.optional_nested_message_extension]: {}')
|
||||
six.assertRaisesRegex(self, text_format.ParseError, (
|
||||
'1:114 : Message type "protobuf_unittest.TestAllExtensions" '
|
||||
'should not have multiple '
|
||||
'"protobuf_unittest.optional_nested_message_extension" extensions.'),
|
||||
text_format.Parse, text, message)
|
||||
|
||||
def testParseDuplicateScalars(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
text = ('optional_int32: 42 ' 'optional_int32: 67')
|
||||
@@ -1062,6 +1126,14 @@ class Proto3Tests(unittest.TestCase):
|
||||
' }\n'
|
||||
'}\n')
|
||||
|
||||
def testTopAnyMessage(self):
|
||||
packed_msg = unittest_pb2.OneString()
|
||||
msg = any_pb2.Any()
|
||||
msg.Pack(packed_msg)
|
||||
text = text_format.MessageToString(msg)
|
||||
other_msg = text_format.Parse(text, any_pb2.Any())
|
||||
self.assertEqual(msg, other_msg)
|
||||
|
||||
def testPrintMessageExpandAnyRepeated(self):
|
||||
packed_message = unittest_pb2.OneString()
|
||||
message = any_test_pb2.TestAny()
|
||||
@@ -1486,7 +1558,7 @@ class TokenizerTest(unittest.TestCase):
|
||||
|
||||
|
||||
# Tests for pretty printer functionality.
|
||||
@_parameterized.Parameters((unittest_pb2), (unittest_proto3_arena_pb2))
|
||||
@_parameterized.parameters((unittest_pb2), (unittest_proto3_arena_pb2))
|
||||
class PrettyPrinterTest(TextFormatBase):
|
||||
|
||||
def testPrettyPrintNoMatch(self, message_module):
|
||||
|
||||
@@ -375,6 +375,9 @@ def _CheckDurationValid(seconds, nanos):
|
||||
raise Error(
|
||||
'Duration is not valid: Nanos {0} must be in range '
|
||||
'[-999999999, 999999999].'.format(nanos))
|
||||
if (nanos < 0 and seconds > 0) or (nanos > 0 and seconds < 0):
|
||||
raise Error(
|
||||
'Duration is not valid: Sign mismatch.')
|
||||
|
||||
|
||||
def _RoundTowardZero(value, divider):
|
||||
@@ -649,9 +652,10 @@ def _MergeMessage(
|
||||
raise ValueError('Error: Field {0} in message {1} is not a singular '
|
||||
'message field and cannot have sub-fields.'.format(
|
||||
name, source_descriptor.full_name))
|
||||
_MergeMessage(
|
||||
child, getattr(source, name), getattr(destination, name),
|
||||
replace_message, replace_repeated)
|
||||
if source.HasField(name):
|
||||
_MergeMessage(
|
||||
child, getattr(source, name), getattr(destination, name),
|
||||
replace_message, replace_repeated)
|
||||
continue
|
||||
if field.label == FieldDescriptor.LABEL_REPEATED:
|
||||
if replace_repeated:
|
||||
|
||||
@@ -101,7 +101,7 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
message.FromJsonString('1970-01-01T00:00:00.1Z')
|
||||
self.assertEqual(0, message.seconds)
|
||||
self.assertEqual(100000000, message.nanos)
|
||||
# Parsing accpets offsets.
|
||||
# Parsing accepts offsets.
|
||||
message.FromJsonString('1970-01-01T00:00:00-08:00')
|
||||
self.assertEqual(8 * 3600, message.seconds)
|
||||
self.assertEqual(0, message.nanos)
|
||||
@@ -345,6 +345,12 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
r'Duration is not valid\: Nanos 1000000000 must be in range'
|
||||
r' \[-999999999\, 999999999\].',
|
||||
message.ToJsonString)
|
||||
message.seconds = -1
|
||||
message.nanos = 1
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
r'Duration is not valid\: Sign mismatch.',
|
||||
message.ToJsonString)
|
||||
|
||||
|
||||
class FieldMaskTest(unittest.TestCase):
|
||||
@@ -599,6 +605,16 @@ class FieldMaskTest(unittest.TestCase):
|
||||
self.assertEqual(1, len(nested_dst.payload.repeated_int32))
|
||||
self.assertEqual(1234, nested_dst.payload.repeated_int32[0])
|
||||
|
||||
# Test Merge oneof field.
|
||||
new_msg = unittest_pb2.TestOneof2()
|
||||
dst = unittest_pb2.TestOneof2()
|
||||
dst.foo_message.qux_int = 1
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
mask.FromJsonString('fooMessage,fooLazyMessage.quxInt')
|
||||
mask.MergeMessage(new_msg, dst)
|
||||
self.assertTrue(dst.HasField('foo_message'))
|
||||
self.assertFalse(dst.HasField('foo_lazy_message'))
|
||||
|
||||
def testMergeErrors(self):
|
||||
src = unittest_pb2.TestAllTypes()
|
||||
dst = unittest_pb2.TestAllTypes()
|
||||
|
||||
@@ -42,21 +42,28 @@ Simple usage example:
|
||||
|
||||
__author__ = 'jieluo@google.com (Jie Luo)'
|
||||
|
||||
# pylint: disable=g-statement-before-imports,g-import-not-at-top
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from ordereddict import OrderedDict #PY26
|
||||
from ordereddict import OrderedDict # PY26
|
||||
# pylint: enable=g-statement-before-imports,g-import-not-at-top
|
||||
|
||||
import base64
|
||||
import json
|
||||
import math
|
||||
import re
|
||||
import six
|
||||
import sys
|
||||
|
||||
from operator import methodcaller
|
||||
|
||||
import re
|
||||
import sys
|
||||
|
||||
import six
|
||||
|
||||
from google.protobuf import descriptor
|
||||
from google.protobuf import symbol_database
|
||||
|
||||
|
||||
_TIMESTAMPFOMAT = '%Y-%m-%dT%H:%M:%S'
|
||||
_INT_TYPES = frozenset([descriptor.FieldDescriptor.CPPTYPE_INT32,
|
||||
descriptor.FieldDescriptor.CPPTYPE_UINT32,
|
||||
@@ -93,7 +100,8 @@ def MessageToJson(message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
indent=2,
|
||||
sort_keys=False):
|
||||
sort_keys=False,
|
||||
use_integers_for_enums=False):
|
||||
"""Converts protobuf message to JSON format.
|
||||
|
||||
Args:
|
||||
@@ -108,18 +116,21 @@ def MessageToJson(message,
|
||||
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.
|
||||
use_integers_for_enums: If true, print integers instead of enum names.
|
||||
|
||||
Returns:
|
||||
A string containing the JSON formatted protocol buffer message.
|
||||
"""
|
||||
printer = _Printer(including_default_value_fields,
|
||||
preserving_proto_field_name)
|
||||
preserving_proto_field_name,
|
||||
use_integers_for_enums)
|
||||
return printer.ToJsonString(message, indent, sort_keys)
|
||||
|
||||
|
||||
def MessageToDict(message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False):
|
||||
preserving_proto_field_name=False,
|
||||
use_integers_for_enums=False):
|
||||
"""Converts protobuf message to a dictionary.
|
||||
|
||||
When the dictionary is encoded to JSON, it conforms to proto3 JSON spec.
|
||||
@@ -133,12 +144,14 @@ def MessageToDict(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.
|
||||
use_integers_for_enums: If true, print integers instead of enum names.
|
||||
|
||||
Returns:
|
||||
A dict representation of the protocol buffer message.
|
||||
"""
|
||||
printer = _Printer(including_default_value_fields,
|
||||
preserving_proto_field_name)
|
||||
preserving_proto_field_name,
|
||||
use_integers_for_enums)
|
||||
# pylint: disable=protected-access
|
||||
return printer._MessageToJsonObject(message)
|
||||
|
||||
@@ -154,9 +167,11 @@ class _Printer(object):
|
||||
|
||||
def __init__(self,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False):
|
||||
preserving_proto_field_name=False,
|
||||
use_integers_for_enums=False):
|
||||
self.including_default_value_fields = including_default_value_fields
|
||||
self.preserving_proto_field_name = preserving_proto_field_name
|
||||
self.use_integers_for_enums = use_integers_for_enums
|
||||
|
||||
def ToJsonString(self, message, indent, sort_keys):
|
||||
js = self._MessageToJsonObject(message)
|
||||
@@ -247,6 +262,8 @@ class _Printer(object):
|
||||
if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
return self._MessageToJsonObject(value)
|
||||
elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM:
|
||||
if self.use_integers_for_enums:
|
||||
return value
|
||||
enum_value = field.enum_type.values_by_number.get(value, None)
|
||||
if enum_value is not None:
|
||||
return enum_value.name
|
||||
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -25,6 +24,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/map_proto2_unittest.proto',
|
||||
package='protobuf_unittest',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('\370\001\001'),
|
||||
serialized_pb=_b('\n)google/protobuf/map_proto2_unittest.proto\x12\x11protobuf_unittest\x1a%google/protobuf/unittest_import.proto\"\xdb\x02\n\x0bTestEnumMap\x12J\n\x0fknown_map_field\x18\x65 \x03(\x0b\x32\x31.protobuf_unittest.TestEnumMap.KnownMapFieldEntry\x12N\n\x11unknown_map_field\x18\x66 \x03(\x0b\x32\x33.protobuf_unittest.TestEnumMap.UnknownMapFieldEntry\x1aV\n\x12KnownMapFieldEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12/\n\x05value\x18\x02 \x01(\x0e\x32 .protobuf_unittest.Proto2MapEnum:\x02\x38\x01\x1aX\n\x14UnknownMapFieldEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12/\n\x05value\x18\x02 \x01(\x0e\x32 .protobuf_unittest.Proto2MapEnum:\x02\x38\x01\"\x88\x03\n\x14TestEnumMapPlusExtra\x12S\n\x0fknown_map_field\x18\x65 \x03(\x0b\x32:.protobuf_unittest.TestEnumMapPlusExtra.KnownMapFieldEntry\x12W\n\x11unknown_map_field\x18\x66 \x03(\x0b\x32<.protobuf_unittest.TestEnumMapPlusExtra.UnknownMapFieldEntry\x1a_\n\x12KnownMapFieldEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\x38\n\x05value\x18\x02 \x01(\x0e\x32).protobuf_unittest.Proto2MapEnumPlusExtra:\x02\x38\x01\x1a\x61\n\x14UnknownMapFieldEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\x38\n\x05value\x18\x02 \x01(\x0e\x32).protobuf_unittest.Proto2MapEnumPlusExtra:\x02\x38\x01\"\xc7\x01\n\x11TestImportEnumMap\x12P\n\x0fimport_enum_amp\x18\x01 \x03(\x0b\x32\x37.protobuf_unittest.TestImportEnumMap.ImportEnumAmpEntry\x1a`\n\x12ImportEnumAmpEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\x39\n\x05value\x18\x02 \x01(\x0e\x32*.protobuf_unittest_import.ImportEnumForMap:\x02\x38\x01\"m\n\rTestIntIntMap\x12\x32\n\x01m\x18\x01 \x03(\x0b\x32\'.protobuf_unittest.TestIntIntMap.MEntry\x1a(\n\x06MEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"\xb8\r\n\x08TestMaps\x12\x38\n\x07m_int32\x18\x01 \x03(\x0b\x32\'.protobuf_unittest.TestMaps.MInt32Entry\x12\x38\n\x07m_int64\x18\x02 \x03(\x0b\x32\'.protobuf_unittest.TestMaps.MInt64Entry\x12:\n\x08m_uint32\x18\x03 \x03(\x0b\x32(.protobuf_unittest.TestMaps.MUint32Entry\x12:\n\x08m_uint64\x18\x04 \x03(\x0b\x32(.protobuf_unittest.TestMaps.MUint64Entry\x12:\n\x08m_sint32\x18\x05 \x03(\x0b\x32(.protobuf_unittest.TestMaps.MSint32Entry\x12:\n\x08m_sint64\x18\x06 \x03(\x0b\x32(.protobuf_unittest.TestMaps.MSint64Entry\x12<\n\tm_fixed32\x18\x07 \x03(\x0b\x32).protobuf_unittest.TestMaps.MFixed32Entry\x12<\n\tm_fixed64\x18\x08 \x03(\x0b\x32).protobuf_unittest.TestMaps.MFixed64Entry\x12>\n\nm_sfixed32\x18\t \x03(\x0b\x32*.protobuf_unittest.TestMaps.MSfixed32Entry\x12>\n\nm_sfixed64\x18\n \x03(\x0b\x32*.protobuf_unittest.TestMaps.MSfixed64Entry\x12\x36\n\x06m_bool\x18\x0b \x03(\x0b\x32&.protobuf_unittest.TestMaps.MBoolEntry\x12:\n\x08m_string\x18\x0c \x03(\x0b\x32(.protobuf_unittest.TestMaps.MStringEntry\x1aO\n\x0bMInt32Entry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aO\n\x0bMInt64Entry\x12\x0b\n\x03key\x18\x01 \x01(\x03\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aP\n\x0cMUint32Entry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aP\n\x0cMUint64Entry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aP\n\x0cMSint32Entry\x12\x0b\n\x03key\x18\x01 \x01(\x11\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aP\n\x0cMSint64Entry\x12\x0b\n\x03key\x18\x01 \x01(\x12\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aQ\n\rMFixed32Entry\x12\x0b\n\x03key\x18\x01 \x01(\x07\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aQ\n\rMFixed64Entry\x12\x0b\n\x03key\x18\x01 \x01(\x06\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aR\n\x0eMSfixed32Entry\x12\x0b\n\x03key\x18\x01 \x01(\x0f\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aR\n\x0eMSfixed64Entry\x12\x0b\n\x03key\x18\x01 \x01(\x10\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aN\n\nMBoolEntry\x12\x0b\n\x03key\x18\x01 \x01(\x08\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\x1aP\n\x0cMStringEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x05value\x18\x02 \x01(\x0b\x32 .protobuf_unittest.TestIntIntMap:\x02\x38\x01\"<\n\x12TestSubmessageMaps\x12&\n\x01m\x18\x01 \x01(\x0b\x32\x1b.protobuf_unittest.TestMaps*Z\n\rProto2MapEnum\x12\x17\n\x13PROTO2_MAP_ENUM_FOO\x10\x00\x12\x17\n\x13PROTO2_MAP_ENUM_BAR\x10\x01\x12\x17\n\x13PROTO2_MAP_ENUM_BAZ\x10\x02*\x86\x01\n\x16Proto2MapEnumPlusExtra\x12\x19\n\x15\x45_PROTO2_MAP_ENUM_FOO\x10\x00\x12\x19\n\x15\x45_PROTO2_MAP_ENUM_BAR\x10\x01\x12\x19\n\x15\x45_PROTO2_MAP_ENUM_BAZ\x10\x02\x12\x1b\n\x17\x45_PROTO2_MAP_ENUM_EXTRA\x10\x03\x42\x03\xf8\x01\x01')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_unittest__import__pb2.DESCRIPTOR,])
|
||||
@@ -37,19 +37,19 @@ _PROTO2MAPENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='PROTO2_MAP_ENUM_FOO', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='PROTO2_MAP_ENUM_BAR', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='PROTO2_MAP_ENUM_BAZ', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=2946,
|
||||
serialized_end=3036,
|
||||
)
|
||||
@@ -64,23 +64,23 @@ _PROTO2MAPENUMPLUSEXTRA = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='E_PROTO2_MAP_ENUM_FOO', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='E_PROTO2_MAP_ENUM_BAR', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='E_PROTO2_MAP_ENUM_BAZ', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='E_PROTO2_MAP_ENUM_EXTRA', index=3, number=3,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=3039,
|
||||
serialized_end=3173,
|
||||
)
|
||||
@@ -110,21 +110,21 @@ _TESTENUMMAP_KNOWNMAPFIELDENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestEnumMap.KnownMapFieldEntry.value', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -147,21 +147,21 @@ _TESTENUMMAP_UNKNOWNMAPFIELDENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestEnumMap.UnknownMapFieldEntry.value', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -184,21 +184,21 @@ _TESTENUMMAP = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='unknown_map_field', full_name='protobuf_unittest.TestEnumMap.unknown_map_field', index=1,
|
||||
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=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTENUMMAP_KNOWNMAPFIELDENTRY, _TESTENUMMAP_UNKNOWNMAPFIELDENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -222,21 +222,21 @@ _TESTENUMMAPPLUSEXTRA_KNOWNMAPFIELDENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestEnumMapPlusExtra.KnownMapFieldEntry.value', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -259,21 +259,21 @@ _TESTENUMMAPPLUSEXTRA_UNKNOWNMAPFIELDENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestEnumMapPlusExtra.UnknownMapFieldEntry.value', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -296,21 +296,21 @@ _TESTENUMMAPPLUSEXTRA = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='unknown_map_field', full_name='protobuf_unittest.TestEnumMapPlusExtra.unknown_map_field', index=1,
|
||||
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=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTENUMMAPPLUSEXTRA_KNOWNMAPFIELDENTRY, _TESTENUMMAPPLUSEXTRA_UNKNOWNMAPFIELDENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -334,21 +334,21 @@ _TESTIMPORTENUMMAP_IMPORTENUMAMPENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestImportEnumMap.ImportEnumAmpEntry.value', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -371,14 +371,14 @@ _TESTIMPORTENUMMAP = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTIMPORTENUMMAP_IMPORTENUMAMPENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -402,21 +402,21 @@ _TESTINTINTMAP_MENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestIntIntMap.MEntry.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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -439,14 +439,14 @@ _TESTINTINTMAP = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTINTINTMAP_MENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -470,21 +470,21 @@ _TESTMAPS_MINT32ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MInt32Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -507,21 +507,21 @@ _TESTMAPS_MINT64ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MInt64Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -544,21 +544,21 @@ _TESTMAPS_MUINT32ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MUint32Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -581,21 +581,21 @@ _TESTMAPS_MUINT64ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MUint64Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -618,21 +618,21 @@ _TESTMAPS_MSINT32ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MSint32Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -655,21 +655,21 @@ _TESTMAPS_MSINT64ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MSint64Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -692,21 +692,21 @@ _TESTMAPS_MFIXED32ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MFixed32Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -729,21 +729,21 @@ _TESTMAPS_MFIXED64ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MFixed64Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -766,21 +766,21 @@ _TESTMAPS_MSFIXED32ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MSfixed32Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -803,21 +803,21 @@ _TESTMAPS_MSFIXED64ENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MSfixed64Entry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -840,21 +840,21 @@ _TESTMAPS_MBOOLENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MBoolEntry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -877,21 +877,21 @@ _TESTMAPS_MSTRINGENTRY = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='protobuf_unittest.TestMaps.MStringEntry.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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -914,91 +914,91 @@ _TESTMAPS = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_int64', full_name='protobuf_unittest.TestMaps.m_int64', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_uint32', full_name='protobuf_unittest.TestMaps.m_uint32', 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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_uint64', full_name='protobuf_unittest.TestMaps.m_uint64', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_sint32', full_name='protobuf_unittest.TestMaps.m_sint32', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_sint64', full_name='protobuf_unittest.TestMaps.m_sint64', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_fixed32', full_name='protobuf_unittest.TestMaps.m_fixed32', 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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_fixed64', full_name='protobuf_unittest.TestMaps.m_fixed64', index=7,
|
||||
number=8, 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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_sfixed32', full_name='protobuf_unittest.TestMaps.m_sfixed32', index=8,
|
||||
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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_sfixed64', full_name='protobuf_unittest.TestMaps.m_sfixed64', index=9,
|
||||
number=10, 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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_bool', full_name='protobuf_unittest.TestMaps.m_bool', index=10,
|
||||
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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='m_string', full_name='protobuf_unittest.TestMaps.m_string', index=11,
|
||||
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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTMAPS_MINT32ENTRY, _TESTMAPS_MINT64ENTRY, _TESTMAPS_MUINT32ENTRY, _TESTMAPS_MUINT64ENTRY, _TESTMAPS_MSINT32ENTRY, _TESTMAPS_MSINT64ENTRY, _TESTMAPS_MFIXED32ENTRY, _TESTMAPS_MFIXED64ENTRY, _TESTMAPS_MSFIXED32ENTRY, _TESTMAPS_MSFIXED64ENTRY, _TESTMAPS_MBOOLENTRY, _TESTMAPS_MSTRINGENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -1022,14 +1022,14 @@ _TESTSUBMESSAGEMAPS = _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -1290,42 +1290,23 @@ TestSubmessageMaps = _reflection.GeneratedProtocolMessageType('TestSubmessageMap
|
||||
_sym_db.RegisterMessage(TestSubmessageMaps)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\370\001\001'))
|
||||
_TESTENUMMAP_KNOWNMAPFIELDENTRY.has_options = True
|
||||
_TESTENUMMAP_KNOWNMAPFIELDENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTENUMMAP_UNKNOWNMAPFIELDENTRY.has_options = True
|
||||
_TESTENUMMAP_UNKNOWNMAPFIELDENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTENUMMAPPLUSEXTRA_KNOWNMAPFIELDENTRY.has_options = True
|
||||
_TESTENUMMAPPLUSEXTRA_KNOWNMAPFIELDENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTENUMMAPPLUSEXTRA_UNKNOWNMAPFIELDENTRY.has_options = True
|
||||
_TESTENUMMAPPLUSEXTRA_UNKNOWNMAPFIELDENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTIMPORTENUMMAP_IMPORTENUMAMPENTRY.has_options = True
|
||||
_TESTIMPORTENUMMAP_IMPORTENUMAMPENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTINTINTMAP_MENTRY.has_options = True
|
||||
_TESTINTINTMAP_MENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MINT32ENTRY.has_options = True
|
||||
_TESTMAPS_MINT32ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MINT64ENTRY.has_options = True
|
||||
_TESTMAPS_MINT64ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MUINT32ENTRY.has_options = True
|
||||
_TESTMAPS_MUINT32ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MUINT64ENTRY.has_options = True
|
||||
_TESTMAPS_MUINT64ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MSINT32ENTRY.has_options = True
|
||||
_TESTMAPS_MSINT32ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MSINT64ENTRY.has_options = True
|
||||
_TESTMAPS_MSINT64ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MFIXED32ENTRY.has_options = True
|
||||
_TESTMAPS_MFIXED32ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MFIXED64ENTRY.has_options = True
|
||||
_TESTMAPS_MFIXED64ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MSFIXED32ENTRY.has_options = True
|
||||
_TESTMAPS_MSFIXED32ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MSFIXED64ENTRY.has_options = True
|
||||
_TESTMAPS_MSFIXED64ENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MBOOLENTRY.has_options = True
|
||||
_TESTMAPS_MBOOLENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
_TESTMAPS_MSTRINGENTRY.has_options = True
|
||||
_TESTMAPS_MSTRINGENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
DESCRIPTOR._options = None
|
||||
_TESTENUMMAP_KNOWNMAPFIELDENTRY._options = None
|
||||
_TESTENUMMAP_UNKNOWNMAPFIELDENTRY._options = None
|
||||
_TESTENUMMAPPLUSEXTRA_KNOWNMAPFIELDENTRY._options = None
|
||||
_TESTENUMMAPPLUSEXTRA_UNKNOWNMAPFIELDENTRY._options = None
|
||||
_TESTIMPORTENUMMAP_IMPORTENUMAMPENTRY._options = None
|
||||
_TESTINTINTMAP_MENTRY._options = None
|
||||
_TESTMAPS_MINT32ENTRY._options = None
|
||||
_TESTMAPS_MINT64ENTRY._options = None
|
||||
_TESTMAPS_MUINT32ENTRY._options = None
|
||||
_TESTMAPS_MUINT64ENTRY._options = None
|
||||
_TESTMAPS_MSINT32ENTRY._options = None
|
||||
_TESTMAPS_MSINT64ENTRY._options = None
|
||||
_TESTMAPS_MFIXED32ENTRY._options = None
|
||||
_TESTMAPS_MFIXED64ENTRY._options = None
|
||||
_TESTMAPS_MSFIXED32ENTRY._options = None
|
||||
_TESTMAPS_MSFIXED64ENTRY._options = None
|
||||
_TESTMAPS_MBOOLENTRY._options = None
|
||||
_TESTMAPS_MSTRINGENTRY._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
File diff suppressed because it is too large.
Load diff
@@ -107,10 +107,6 @@ bool _CalledFromGeneratedFile(int stacklevel) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (frame->f_globals != frame->f_locals) {
|
||||
// Not at global module scope
|
||||
return false;
|
||||
}
|
||||
|
||||
if (frame->f_code->co_filename == NULL) {
|
||||
return false;
|
||||
@@ -123,6 +119,10 @@ bool _CalledFromGeneratedFile(int stacklevel) {
|
||||
PyErr_Clear();
|
||||
return false;
|
||||
}
|
||||
if ((filename_size < 3) || (strcmp(&filename[filename_size - 3], ".py") != 0)) {
|
||||
// Cython's stack does not have .py file name and is not at global module scope.
|
||||
return true;
|
||||
}
|
||||
if (filename_size < 7) {
|
||||
// filename is too short.
|
||||
return false;
|
||||
@@ -131,6 +131,11 @@ bool _CalledFromGeneratedFile(int stacklevel) {
|
||||
// Filename is not ending with _pb2.
|
||||
return false;
|
||||
}
|
||||
|
||||
if (frame->f_globals != frame->f_locals) {
|
||||
// Not at global module scope
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
@@ -188,38 +193,35 @@ const FileDescriptor* GetFileDescriptor(const MethodDescriptor* descriptor) {
|
||||
// Always returns a new reference.
|
||||
template<class DescriptorClass>
|
||||
static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) {
|
||||
// Options (and their extensions) are completely resolved in the proto file
|
||||
// containing the descriptor.
|
||||
PyDescriptorPool* pool = GetDescriptorPool_FromPool(
|
||||
GetFileDescriptor(descriptor)->pool());
|
||||
|
||||
hash_map<const void*, PyObject*>* descriptor_options =
|
||||
pool->descriptor_options;
|
||||
// Options are cached in the pool that owns the descriptor.
|
||||
// First search in the cache.
|
||||
PyDescriptorPool* caching_pool = GetDescriptorPool_FromPool(
|
||||
GetFileDescriptor(descriptor)->pool());
|
||||
hash_map<const void*, PyObject*>* descriptor_options =
|
||||
caching_pool->descriptor_options;
|
||||
if (descriptor_options->find(descriptor) != descriptor_options->end()) {
|
||||
PyObject *value = (*descriptor_options)[descriptor];
|
||||
Py_INCREF(value);
|
||||
return value;
|
||||
}
|
||||
|
||||
// Similar to the C++ implementation, we return an Options object from the
|
||||
// default (generated) factory, so that client code know that they can use
|
||||
// extensions from generated files:
|
||||
// d.GetOptions().Extensions[some_pb2.extension]
|
||||
//
|
||||
// The consequence is that extensions not defined in the default pool won't
|
||||
// be available. If needed, we could add an optional 'message_factory'
|
||||
// parameter to the GetOptions() function.
|
||||
PyMessageFactory* message_factory =
|
||||
GetDefaultDescriptorPool()->py_message_factory;
|
||||
|
||||
// Build the Options object: get its Python class, and make a copy of the C++
|
||||
// read-only instance.
|
||||
const Message& options(descriptor->options());
|
||||
const Descriptor *message_type = options.GetDescriptor();
|
||||
PyMessageFactory* message_factory = pool->py_message_factory;
|
||||
CMessageClass* message_class = message_factory::GetMessageClass(
|
||||
CMessageClass* message_class = message_factory::GetOrCreateMessageClass(
|
||||
message_factory, message_type);
|
||||
if (message_class == NULL) {
|
||||
// The Options message was not found in the current DescriptorPool.
|
||||
// This means that the pool cannot contain any extensions to the Options
|
||||
// message either, so falling back to the basic pool we can only increase
|
||||
// the chances of successfully parsing the options.
|
||||
PyErr_Clear();
|
||||
pool = GetDefaultDescriptorPool();
|
||||
message_factory = pool->py_message_factory;
|
||||
message_class = message_factory::GetMessageClass(
|
||||
message_factory, message_type);
|
||||
}
|
||||
if (message_class == NULL) {
|
||||
PyErr_Format(PyExc_TypeError, "Could not retrieve class for Options: %s",
|
||||
message_type->full_name().c_str());
|
||||
@@ -248,7 +250,8 @@ static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) {
|
||||
options.SerializeToString(&serialized);
|
||||
io::CodedInputStream input(
|
||||
reinterpret_cast<const uint8*>(serialized.c_str()), serialized.size());
|
||||
input.SetExtensionRegistry(pool->pool, message_factory->message_factory);
|
||||
input.SetExtensionRegistry(message_factory->pool->pool,
|
||||
message_factory->message_factory);
|
||||
bool success = cmsg->message->MergePartialFromCodedStream(&input);
|
||||
if (!success) {
|
||||
PyErr_Format(PyExc_ValueError, "Error parsing Options message");
|
||||
@@ -564,6 +567,11 @@ static int SetOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
return CheckCalledFromGeneratedFile("_options");
|
||||
}
|
||||
|
||||
static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
void *closure) {
|
||||
return CheckCalledFromGeneratedFile("_serialized_options");
|
||||
}
|
||||
|
||||
static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
|
||||
return CopyToPythonProto<DescriptorProto>(_GetDescriptor(self), target);
|
||||
}
|
||||
@@ -623,6 +631,8 @@ static PyGetSetDef Getters[] = {
|
||||
{ "is_extendable", (getter)IsExtendable, (setter)NULL},
|
||||
{ "has_options", (getter)GetHasOptions, (setter)SetHasOptions, "Has Options"},
|
||||
{ "_options", (getter)NULL, (setter)SetOptions, "Options"},
|
||||
{ "_serialized_options", (getter)NULL, (setter)SetSerializedOptions,
|
||||
"Serialized Options"},
|
||||
{ "syntax", (getter)GetSyntax, (setter)NULL, "Syntax"},
|
||||
{NULL}
|
||||
};
|
||||
@@ -785,7 +795,7 @@ static PyObject* GetDefaultValue(PyBaseDescriptor *self, void *closure) {
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_STRING: {
|
||||
string value = _GetDescriptor(self)->default_value_string();
|
||||
const string& value = _GetDescriptor(self)->default_value_string();
|
||||
result = ToStringObject(_GetDescriptor(self), value);
|
||||
break;
|
||||
}
|
||||
@@ -897,6 +907,10 @@ static int SetOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
return CheckCalledFromGeneratedFile("_options");
|
||||
}
|
||||
|
||||
static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
void *closure) {
|
||||
return CheckCalledFromGeneratedFile("_serialized_options");
|
||||
}
|
||||
|
||||
static PyGetSetDef Getters[] = {
|
||||
{ "full_name", (getter)GetFullName, NULL, "Full name"},
|
||||
@@ -926,6 +940,8 @@ static PyGetSetDef Getters[] = {
|
||||
"Containing oneof"},
|
||||
{ "has_options", (getter)GetHasOptions, (setter)SetHasOptions, "Has Options"},
|
||||
{ "_options", (getter)NULL, (setter)SetOptions, "Options"},
|
||||
{ "_serialized_options", (getter)NULL, (setter)SetSerializedOptions,
|
||||
"Serialized Options"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
@@ -1055,6 +1071,11 @@ static int SetOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
return CheckCalledFromGeneratedFile("_options");
|
||||
}
|
||||
|
||||
static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
void *closure) {
|
||||
return CheckCalledFromGeneratedFile("_serialized_options");
|
||||
}
|
||||
|
||||
static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
|
||||
return CopyToPythonProto<EnumDescriptorProto>(_GetDescriptor(self), target);
|
||||
}
|
||||
@@ -1079,6 +1100,8 @@ static PyGetSetDef Getters[] = {
|
||||
"Containing type"},
|
||||
{ "has_options", (getter)GetHasOptions, (setter)SetHasOptions, "Has Options"},
|
||||
{ "_options", (getter)NULL, (setter)SetOptions, "Options"},
|
||||
{ "_serialized_options", (getter)NULL, (setter)SetSerializedOptions,
|
||||
"Serialized Options"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
@@ -1179,6 +1202,10 @@ static int SetOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
return CheckCalledFromGeneratedFile("_options");
|
||||
}
|
||||
|
||||
static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
void *closure) {
|
||||
return CheckCalledFromGeneratedFile("_serialized_options");
|
||||
}
|
||||
|
||||
static PyGetSetDef Getters[] = {
|
||||
{ "name", (getter)GetName, NULL, "name"},
|
||||
@@ -1188,6 +1215,8 @@ static PyGetSetDef Getters[] = {
|
||||
|
||||
{ "has_options", (getter)GetHasOptions, (setter)SetHasOptions, "Has Options"},
|
||||
{ "_options", (getter)NULL, (setter)SetOptions, "Options"},
|
||||
{ "_serialized_options", (getter)NULL, (setter)SetSerializedOptions,
|
||||
"Serialized Options"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
@@ -1330,6 +1359,11 @@ static int SetOptions(PyFileDescriptor *self, PyObject *value,
|
||||
return CheckCalledFromGeneratedFile("_options");
|
||||
}
|
||||
|
||||
static int SetSerializedOptions(PyFileDescriptor *self, PyObject *value,
|
||||
void *closure) {
|
||||
return CheckCalledFromGeneratedFile("_serialized_options");
|
||||
}
|
||||
|
||||
static PyObject* GetSyntax(PyFileDescriptor *self, void *closure) {
|
||||
return PyString_InternFromString(
|
||||
FileDescriptor::SyntaxName(_GetDescriptor(self)->syntax()));
|
||||
@@ -1355,6 +1389,8 @@ static PyGetSetDef Getters[] = {
|
||||
|
||||
{ "has_options", (getter)GetHasOptions, (setter)SetHasOptions, "Has Options"},
|
||||
{ "_options", (getter)NULL, (setter)SetOptions, "Options"},
|
||||
{ "_serialized_options", (getter)NULL, (setter)SetSerializedOptions,
|
||||
"Serialized Options"},
|
||||
{ "syntax", (getter)GetSyntax, (setter)NULL, "Syntax"},
|
||||
{NULL}
|
||||
};
|
||||
@@ -1500,6 +1536,11 @@ static int SetOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
return CheckCalledFromGeneratedFile("_options");
|
||||
}
|
||||
|
||||
static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
|
||||
void *closure) {
|
||||
return CheckCalledFromGeneratedFile("_serialized_options");
|
||||
}
|
||||
|
||||
static PyGetSetDef Getters[] = {
|
||||
{ "name", (getter)GetName, NULL, "Name"},
|
||||
{ "full_name", (getter)GetFullName, NULL, "Full name"},
|
||||
@@ -1508,6 +1549,8 @@ static PyGetSetDef Getters[] = {
|
||||
{ "containing_type", (getter)GetContainingType, NULL, "Containing type"},
|
||||
{ "has_options", (getter)GetHasOptions, (setter)SetHasOptions, "Has Options"},
|
||||
{ "_options", (getter)NULL, (setter)SetOptions, "Options"},
|
||||
{ "_serialized_options", (getter)NULL, (setter)SetSerializedOptions,
|
||||
"Serialized Options"},
|
||||
{ "fields", (getter)GetFields, NULL, "Fields"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
@@ -957,55 +957,55 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->field_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindFieldByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByCamelcaseName(PyContainer* self,
|
||||
static const void* GetByCamelcaseName(PyContainer* self,
|
||||
const string& name) {
|
||||
return GetDescriptor(self)->FindFieldByCamelcaseName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByNumber(PyContainer* self, int number) {
|
||||
static const void* GetByNumber(PyContainer* self, int number) {
|
||||
return GetDescriptor(self)->FindFieldByNumber(number);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->field(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyFieldDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static const string& GetItemCamelcaseName(ItemDescriptor item) {
|
||||
return item->camelcase_name();
|
||||
static const string& GetItemCamelcaseName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->camelcase_name();
|
||||
}
|
||||
|
||||
static int GetItemNumber(ItemDescriptor item) {
|
||||
return item->number();
|
||||
static int GetItemNumber(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->number();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"MessageFields",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)GetByCamelcaseName,
|
||||
(GetByNumberMethod)GetByNumber,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)GetItemCamelcaseName,
|
||||
(GetItemNumberMethod)GetItemNumber,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
GetByCamelcaseName,
|
||||
GetByNumber,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
GetItemCamelcaseName,
|
||||
GetItemNumber,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace fields
|
||||
@@ -1035,38 +1035,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->nested_type_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindNestedTypeByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->nested_type(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyMessageDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyMessageDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"MessageNestedTypes",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace nested_types
|
||||
@@ -1087,38 +1087,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->enum_type_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindEnumTypeByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->enum_type(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyEnumDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyEnumDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"MessageNestedEnums",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace enums
|
||||
@@ -1150,11 +1150,11 @@ static int Count(PyContainer* self) {
|
||||
return count;
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindEnumValueByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
// This is not optimal, but the number of enums *types* in a given message
|
||||
// is small. This function is only used when iterating over the mapping.
|
||||
const EnumDescriptor* enum_type = NULL;
|
||||
@@ -1173,26 +1173,27 @@ static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
return enum_type->value(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyEnumValueDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyEnumValueDescriptor_FromDescriptor(
|
||||
static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"MessageEnumValues",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)NULL,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
};
|
||||
|
||||
} // namespace enumvalues
|
||||
@@ -1209,38 +1210,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->extension_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindExtensionByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->extension(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyFieldDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"MessageExtensions",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace extensions
|
||||
@@ -1261,38 +1262,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->oneof_decl_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindOneofByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->oneof_decl(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyOneofDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyOneofDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"MessageOneofs",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace oneofs
|
||||
@@ -1323,46 +1324,47 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->value_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->value(index);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindValueByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByNumber(PyContainer* self, int number) {
|
||||
static const void* GetByNumber(PyContainer* self, int number) {
|
||||
return GetDescriptor(self)->FindValueByNumber(number);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyEnumValueDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyEnumValueDescriptor_FromDescriptor(
|
||||
static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemNumber(ItemDescriptor item) {
|
||||
return item->number();
|
||||
static int GetItemNumber(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->number();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"EnumValues",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)GetByNumber,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)GetItemNumber,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
GetByNumber,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
GetItemNumber,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace enumvalues
|
||||
@@ -1397,30 +1399,30 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->field_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->field(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyFieldDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index_in_oneof();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index_in_oneof();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"OneofFields",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)NULL,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)NULL,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace fields
|
||||
@@ -1447,38 +1449,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->method_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindMethodByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->method(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyMethodDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyMethodDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"ServiceMethods",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace methods
|
||||
@@ -1509,38 +1511,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->message_type_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindMessageTypeByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->message_type(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyMessageDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyMessageDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"FileMessages",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace messages
|
||||
@@ -1557,38 +1559,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->enum_type_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindEnumTypeByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->enum_type(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyEnumDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyEnumDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"FileEnums",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace enums
|
||||
@@ -1605,38 +1607,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->extension_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindExtensionByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->extension(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyFieldDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"FileExtensions",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace extensions
|
||||
@@ -1653,38 +1655,38 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->service_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
return GetDescriptor(self)->FindServiceByName(name);
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->service(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyServiceDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyServiceDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(ItemDescriptor item) {
|
||||
return item->name();
|
||||
static const string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static int GetItemIndex(ItemDescriptor item) {
|
||||
return item->index();
|
||||
static int GetItemIndex(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->index();
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"FileServices",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)GetByName,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)GetItemName,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)GetItemIndex,
|
||||
Count,
|
||||
GetByIndex,
|
||||
GetByName,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
GetItemName,
|
||||
NULL,
|
||||
NULL,
|
||||
GetItemIndex,
|
||||
};
|
||||
|
||||
} // namespace services
|
||||
@@ -1701,26 +1703,26 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->dependency_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->dependency(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyFileDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFileDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"FileDependencies",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)NULL,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)NULL,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)NULL,
|
||||
Count,
|
||||
GetByIndex,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
};
|
||||
|
||||
} // namespace dependencies
|
||||
@@ -1737,26 +1739,26 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->public_dependency_count();
|
||||
}
|
||||
|
||||
static ItemDescriptor GetByIndex(PyContainer* self, int index) {
|
||||
static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->public_dependency(index);
|
||||
}
|
||||
|
||||
static PyObject* NewObjectFromItem(ItemDescriptor item) {
|
||||
return PyFileDescriptor_FromDescriptor(item);
|
||||
static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFileDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static DescriptorContainerDef ContainerDef = {
|
||||
"FilePublicDependencies",
|
||||
(CountMethod)Count,
|
||||
(GetByIndexMethod)GetByIndex,
|
||||
(GetByNameMethod)NULL,
|
||||
(GetByCamelcaseNameMethod)NULL,
|
||||
(GetByNumberMethod)NULL,
|
||||
(NewObjectFromItemMethod)NewObjectFromItem,
|
||||
(GetItemNameMethod)NULL,
|
||||
(GetItemCamelcaseNameMethod)NULL,
|
||||
(GetItemNumberMethod)NULL,
|
||||
(GetItemIndexMethod)NULL,
|
||||
Count,
|
||||
GetByIndex,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NewObjectFromItem,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
};
|
||||
|
||||
} // namespace public_dependencies
|
||||
|
||||
@@ -149,7 +149,8 @@ static PyObject* New(PyTypeObject* type,
|
||||
PyDescriptorPool_NewWithDatabase(database));
|
||||
}
|
||||
|
||||
static void Dealloc(PyDescriptorPool* self) {
|
||||
static void Dealloc(PyObject* pself) {
|
||||
PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
|
||||
descriptor_pool_map.erase(self->pool);
|
||||
Py_CLEAR(self->py_message_factory);
|
||||
for (hash_map<const void*, PyObject*>::iterator it =
|
||||
@@ -163,7 +164,7 @@ static void Dealloc(PyDescriptorPool* self) {
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
}
|
||||
|
||||
PyObject* FindMessageByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
static PyObject* FindMessageByName(PyObject* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
|
||||
@@ -171,7 +172,8 @@ PyObject* FindMessageByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const Descriptor* message_descriptor =
|
||||
self->pool->FindMessageTypeByName(string(name, name_size));
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMessageTypeByName(
|
||||
string(name, name_size));
|
||||
|
||||
if (message_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find message %.200s", name);
|
||||
@@ -184,7 +186,7 @@ PyObject* FindMessageByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
|
||||
|
||||
|
||||
PyObject* FindFileByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
static PyObject* FindFileByName(PyObject* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
|
||||
@@ -192,7 +194,8 @@ PyObject* FindFileByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const FileDescriptor* file_descriptor =
|
||||
self->pool->FindFileByName(string(name, name_size));
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileByName(
|
||||
string(name, name_size));
|
||||
if (file_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find file %.200s", name);
|
||||
return NULL;
|
||||
@@ -218,6 +221,10 @@ PyObject* FindFieldByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyFieldDescriptor_FromDescriptor(field_descriptor);
|
||||
}
|
||||
|
||||
static PyObject* FindFieldByNameMethod(PyObject* self, PyObject* arg) {
|
||||
return FindFieldByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
|
||||
}
|
||||
|
||||
PyObject* FindExtensionByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
@@ -235,6 +242,10 @@ PyObject* FindExtensionByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyFieldDescriptor_FromDescriptor(field_descriptor);
|
||||
}
|
||||
|
||||
static PyObject* FindExtensionByNameMethod(PyObject* self, PyObject* arg) {
|
||||
return FindExtensionByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
|
||||
}
|
||||
|
||||
PyObject* FindEnumTypeByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
@@ -252,6 +263,10 @@ PyObject* FindEnumTypeByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyEnumDescriptor_FromDescriptor(enum_descriptor);
|
||||
}
|
||||
|
||||
static PyObject* FindEnumTypeByNameMethod(PyObject* self, PyObject* arg) {
|
||||
return FindEnumTypeByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
|
||||
}
|
||||
|
||||
PyObject* FindOneofByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
@@ -269,7 +284,11 @@ PyObject* FindOneofByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyOneofDescriptor_FromDescriptor(oneof_descriptor);
|
||||
}
|
||||
|
||||
PyObject* FindServiceByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
static PyObject* FindOneofByNameMethod(PyObject* self, PyObject* arg) {
|
||||
return FindOneofByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
|
||||
}
|
||||
|
||||
static PyObject* FindServiceByName(PyObject* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
|
||||
@@ -277,7 +296,8 @@ PyObject* FindServiceByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const ServiceDescriptor* service_descriptor =
|
||||
self->pool->FindServiceByName(string(name, name_size));
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindServiceByName(
|
||||
string(name, name_size));
|
||||
if (service_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find service %.200s", name);
|
||||
return NULL;
|
||||
@@ -286,7 +306,7 @@ PyObject* FindServiceByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyServiceDescriptor_FromDescriptor(service_descriptor);
|
||||
}
|
||||
|
||||
PyObject* FindMethodByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
static PyObject* FindMethodByName(PyObject* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
|
||||
@@ -294,7 +314,8 @@ PyObject* FindMethodByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const MethodDescriptor* method_descriptor =
|
||||
self->pool->FindMethodByName(string(name, name_size));
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMethodByName(
|
||||
string(name, name_size));
|
||||
if (method_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
|
||||
return NULL;
|
||||
@@ -303,7 +324,7 @@ PyObject* FindMethodByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyMethodDescriptor_FromDescriptor(method_descriptor);
|
||||
}
|
||||
|
||||
PyObject* FindFileContainingSymbol(PyDescriptorPool* self, PyObject* arg) {
|
||||
static PyObject* FindFileContainingSymbol(PyObject* self, PyObject* arg) {
|
||||
Py_ssize_t name_size;
|
||||
char* name;
|
||||
if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
|
||||
@@ -311,7 +332,8 @@ PyObject* FindFileContainingSymbol(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const FileDescriptor* file_descriptor =
|
||||
self->pool->FindFileContainingSymbol(string(name, name_size));
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileContainingSymbol(
|
||||
string(name, name_size));
|
||||
if (file_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find symbol %.200s", name);
|
||||
return NULL;
|
||||
@@ -320,7 +342,7 @@ PyObject* FindFileContainingSymbol(PyDescriptorPool* self, PyObject* arg) {
|
||||
return PyFileDescriptor_FromDescriptor(file_descriptor);
|
||||
}
|
||||
|
||||
PyObject* FindExtensionByNumber(PyDescriptorPool* self, PyObject* args) {
|
||||
static PyObject* FindExtensionByNumber(PyObject* self, PyObject* args) {
|
||||
PyObject* message_descriptor;
|
||||
int number;
|
||||
if (!PyArg_ParseTuple(args, "Oi", &message_descriptor, &number)) {
|
||||
@@ -333,7 +355,8 @@ PyObject* FindExtensionByNumber(PyDescriptorPool* self, PyObject* args) {
|
||||
}
|
||||
|
||||
const FieldDescriptor* extension_descriptor =
|
||||
self->pool->FindExtensionByNumber(descriptor, number);
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindExtensionByNumber(
|
||||
descriptor, number);
|
||||
if (extension_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find extension %d", number);
|
||||
return NULL;
|
||||
@@ -342,14 +365,15 @@ PyObject* FindExtensionByNumber(PyDescriptorPool* self, PyObject* args) {
|
||||
return PyFieldDescriptor_FromDescriptor(extension_descriptor);
|
||||
}
|
||||
|
||||
PyObject* FindAllExtensions(PyDescriptorPool* self, PyObject* arg) {
|
||||
static PyObject* FindAllExtensions(PyObject* self, PyObject* arg) {
|
||||
const Descriptor* descriptor = PyMessageDescriptor_AsDescriptor(arg);
|
||||
if (descriptor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
std::vector<const FieldDescriptor*> extensions;
|
||||
self->pool->FindAllExtensions(descriptor, &extensions);
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindAllExtensions(
|
||||
descriptor, &extensions);
|
||||
|
||||
ScopedPyObjectPtr result(PyList_New(extensions.size()));
|
||||
if (result == NULL) {
|
||||
@@ -374,14 +398,15 @@ PyObject* FindAllExtensions(PyDescriptorPool* self, PyObject* arg) {
|
||||
// call a function that will just be a no-op?
|
||||
// TODO(amauryfa): Need to investigate further.
|
||||
|
||||
PyObject* AddFileDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
static PyObject* AddFileDescriptor(PyObject* self, PyObject* descriptor) {
|
||||
const FileDescriptor* file_descriptor =
|
||||
PyFileDescriptor_AsDescriptor(descriptor);
|
||||
if (!file_descriptor) {
|
||||
return NULL;
|
||||
}
|
||||
if (file_descriptor !=
|
||||
self->pool->FindFileByName(file_descriptor->name())) {
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileByName(
|
||||
file_descriptor->name())) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"The file descriptor %s does not belong to this pool",
|
||||
file_descriptor->name().c_str());
|
||||
@@ -390,14 +415,15 @@ PyObject* AddFileDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
PyObject* AddDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
static PyObject* AddDescriptor(PyObject* self, PyObject* descriptor) {
|
||||
const Descriptor* message_descriptor =
|
||||
PyMessageDescriptor_AsDescriptor(descriptor);
|
||||
if (!message_descriptor) {
|
||||
return NULL;
|
||||
}
|
||||
if (message_descriptor !=
|
||||
self->pool->FindMessageTypeByName(message_descriptor->full_name())) {
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMessageTypeByName(
|
||||
message_descriptor->full_name())) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"The message descriptor %s does not belong to this pool",
|
||||
message_descriptor->full_name().c_str());
|
||||
@@ -406,14 +432,15 @@ PyObject* AddDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
PyObject* AddEnumDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
static PyObject* AddEnumDescriptor(PyObject* self, PyObject* descriptor) {
|
||||
const EnumDescriptor* enum_descriptor =
|
||||
PyEnumDescriptor_AsDescriptor(descriptor);
|
||||
if (!enum_descriptor) {
|
||||
return NULL;
|
||||
}
|
||||
if (enum_descriptor !=
|
||||
self->pool->FindEnumTypeByName(enum_descriptor->full_name())) {
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindEnumTypeByName(
|
||||
enum_descriptor->full_name())) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"The enum descriptor %s does not belong to this pool",
|
||||
enum_descriptor->full_name().c_str());
|
||||
@@ -422,14 +449,15 @@ PyObject* AddEnumDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
PyObject* AddExtensionDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
static PyObject* AddExtensionDescriptor(PyObject* self, PyObject* descriptor) {
|
||||
const FieldDescriptor* extension_descriptor =
|
||||
PyFieldDescriptor_AsDescriptor(descriptor);
|
||||
if (!extension_descriptor) {
|
||||
return NULL;
|
||||
}
|
||||
if (extension_descriptor !=
|
||||
self->pool->FindExtensionByName(extension_descriptor->full_name())) {
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindExtensionByName(
|
||||
extension_descriptor->full_name())) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"The extension descriptor %s does not belong to this pool",
|
||||
extension_descriptor->full_name().c_str());
|
||||
@@ -438,14 +466,15 @@ PyObject* AddExtensionDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
PyObject* AddServiceDescriptor(PyDescriptorPool* self, PyObject* descriptor) {
|
||||
static PyObject* AddServiceDescriptor(PyObject* self, PyObject* descriptor) {
|
||||
const ServiceDescriptor* service_descriptor =
|
||||
PyServiceDescriptor_AsDescriptor(descriptor);
|
||||
if (!service_descriptor) {
|
||||
return NULL;
|
||||
}
|
||||
if (service_descriptor !=
|
||||
self->pool->FindServiceByName(service_descriptor->full_name())) {
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindServiceByName(
|
||||
service_descriptor->full_name())) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"The service descriptor %s does not belong to this pool",
|
||||
service_descriptor->full_name().c_str());
|
||||
@@ -481,7 +510,8 @@ class BuildFileErrorCollector : public DescriptorPool::ErrorCollector {
|
||||
bool had_errors;
|
||||
};
|
||||
|
||||
PyObject* AddSerializedFile(PyDescriptorPool* self, PyObject* serialized_pb) {
|
||||
static PyObject* AddSerializedFile(PyObject* pself, PyObject* serialized_pb) {
|
||||
PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
|
||||
char* message_type;
|
||||
Py_ssize_t message_len;
|
||||
|
||||
@@ -529,7 +559,7 @@ PyObject* AddSerializedFile(PyDescriptorPool* self, PyObject* serialized_pb) {
|
||||
descriptor, serialized_pb);
|
||||
}
|
||||
|
||||
PyObject* Add(PyDescriptorPool* self, PyObject* file_descriptor_proto) {
|
||||
static PyObject* Add(PyObject* self, PyObject* file_descriptor_proto) {
|
||||
ScopedPyObjectPtr serialized_pb(
|
||||
PyObject_CallMethod(file_descriptor_proto, "SerializeToString", NULL));
|
||||
if (serialized_pb == NULL) {
|
||||
@@ -539,46 +569,46 @@ PyObject* Add(PyDescriptorPool* self, PyObject* file_descriptor_proto) {
|
||||
}
|
||||
|
||||
static PyMethodDef Methods[] = {
|
||||
{ "Add", (PyCFunction)Add, METH_O,
|
||||
{ "Add", Add, METH_O,
|
||||
"Adds the FileDescriptorProto and its types to this pool." },
|
||||
{ "AddSerializedFile", (PyCFunction)AddSerializedFile, METH_O,
|
||||
{ "AddSerializedFile", AddSerializedFile, METH_O,
|
||||
"Adds a serialized FileDescriptorProto to this pool." },
|
||||
|
||||
// TODO(amauryfa): Understand why the Python implementation differs from
|
||||
// this one, ask users to use another API and deprecate these functions.
|
||||
{ "AddFileDescriptor", (PyCFunction)AddFileDescriptor, METH_O,
|
||||
{ "AddFileDescriptor", AddFileDescriptor, METH_O,
|
||||
"No-op. Add() must have been called before." },
|
||||
{ "AddDescriptor", (PyCFunction)AddDescriptor, METH_O,
|
||||
{ "AddDescriptor", AddDescriptor, METH_O,
|
||||
"No-op. Add() must have been called before." },
|
||||
{ "AddEnumDescriptor", (PyCFunction)AddEnumDescriptor, METH_O,
|
||||
{ "AddEnumDescriptor", AddEnumDescriptor, METH_O,
|
||||
"No-op. Add() must have been called before." },
|
||||
{ "AddExtensionDescriptor", (PyCFunction)AddExtensionDescriptor, METH_O,
|
||||
{ "AddExtensionDescriptor", AddExtensionDescriptor, METH_O,
|
||||
"No-op. Add() must have been called before." },
|
||||
{ "AddServiceDescriptor", (PyCFunction)AddServiceDescriptor, METH_O,
|
||||
{ "AddServiceDescriptor", AddServiceDescriptor, METH_O,
|
||||
"No-op. Add() must have been called before." },
|
||||
|
||||
{ "FindFileByName", (PyCFunction)FindFileByName, METH_O,
|
||||
{ "FindFileByName", FindFileByName, METH_O,
|
||||
"Searches for a file descriptor by its .proto name." },
|
||||
{ "FindMessageTypeByName", (PyCFunction)FindMessageByName, METH_O,
|
||||
{ "FindMessageTypeByName", FindMessageByName, METH_O,
|
||||
"Searches for a message descriptor by full name." },
|
||||
{ "FindFieldByName", (PyCFunction)FindFieldByName, METH_O,
|
||||
{ "FindFieldByName", FindFieldByNameMethod, METH_O,
|
||||
"Searches for a field descriptor by full name." },
|
||||
{ "FindExtensionByName", (PyCFunction)FindExtensionByName, METH_O,
|
||||
{ "FindExtensionByName", FindExtensionByNameMethod, METH_O,
|
||||
"Searches for extension descriptor by full name." },
|
||||
{ "FindEnumTypeByName", (PyCFunction)FindEnumTypeByName, METH_O,
|
||||
{ "FindEnumTypeByName", FindEnumTypeByNameMethod, METH_O,
|
||||
"Searches for enum type descriptor by full name." },
|
||||
{ "FindOneofByName", (PyCFunction)FindOneofByName, METH_O,
|
||||
{ "FindOneofByName", FindOneofByNameMethod, METH_O,
|
||||
"Searches for oneof descriptor by full name." },
|
||||
{ "FindServiceByName", (PyCFunction)FindServiceByName, METH_O,
|
||||
{ "FindServiceByName", FindServiceByName, METH_O,
|
||||
"Searches for service descriptor by full name." },
|
||||
{ "FindMethodByName", (PyCFunction)FindMethodByName, METH_O,
|
||||
{ "FindMethodByName", FindMethodByName, METH_O,
|
||||
"Searches for method descriptor by full name." },
|
||||
|
||||
{ "FindFileContainingSymbol", (PyCFunction)FindFileContainingSymbol, METH_O,
|
||||
{ "FindFileContainingSymbol", FindFileContainingSymbol, METH_O,
|
||||
"Gets the FileDescriptor containing the specified symbol." },
|
||||
{ "FindExtensionByNumber", (PyCFunction)FindExtensionByNumber, METH_VARARGS,
|
||||
{ "FindExtensionByNumber", FindExtensionByNumber, METH_VARARGS,
|
||||
"Gets the extension descriptor for the given number." },
|
||||
{ "FindAllExtensions", (PyCFunction)FindAllExtensions, METH_O,
|
||||
{ "FindAllExtensions", FindAllExtensions, METH_O,
|
||||
"Gets all known extensions of the given message descriptor." },
|
||||
{NULL}
|
||||
};
|
||||
@@ -590,7 +620,7 @@ PyTypeObject PyDescriptorPool_Type = {
|
||||
FULL_MODULE_NAME ".DescriptorPool", // tp_name
|
||||
sizeof(PyDescriptorPool), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)cdescriptor_pool::Dealloc, // tp_dealloc
|
||||
cdescriptor_pool::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
|
||||
#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>
|
||||
|
||||
@@ -37,9 +37,8 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -47,16 +46,8 @@ namespace protobuf {
|
||||
class Message;
|
||||
class FieldDescriptor;
|
||||
|
||||
#ifdef _SHARED_PTR_H
|
||||
using std::shared_ptr;
|
||||
#else
|
||||
using internal::shared_ptr;
|
||||
#endif
|
||||
|
||||
namespace python {
|
||||
|
||||
struct CMessage;
|
||||
|
||||
typedef struct ExtensionDict {
|
||||
PyObject_HEAD;
|
||||
|
||||
@@ -64,7 +55,7 @@ typedef struct ExtensionDict {
|
||||
// proto tree. Every Python container class holds a
|
||||
// reference to it in order to keep it alive as long as there's a
|
||||
// Python object that references any part of the tree.
|
||||
shared_ptr<Message> owner;
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// Weak reference to parent message. Used to make sure
|
||||
// the parent is writable when an extension field is modified.
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
#include <google/protobuf/pyext/map_container.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>
|
||||
@@ -76,7 +73,7 @@ class MapReflectionFriend {
|
||||
struct MapIterator {
|
||||
PyObject_HEAD;
|
||||
|
||||
google::protobuf::scoped_ptr< ::google::protobuf::MapIterator> iter;
|
||||
std::unique_ptr<::google::protobuf::MapIterator> iter;
|
||||
|
||||
// A pointer back to the container, so we can notice changes to the version.
|
||||
// We own a ref on this.
|
||||
@@ -94,7 +91,7 @@ struct MapIterator {
|
||||
// as this iterator does. This is solely for the benefit of the MapIterator
|
||||
// destructor -- we should never actually access the iterator in this state
|
||||
// except to delete it.
|
||||
shared_ptr<Message> owner;
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// The version of the map when we took the iterator to it.
|
||||
//
|
||||
@@ -339,6 +336,24 @@ PyObject* GetEntryClass(PyObject* _self) {
|
||||
return reinterpret_cast<PyObject*>(message_class);
|
||||
}
|
||||
|
||||
PyObject* MergeFrom(PyObject* _self, PyObject* arg) {
|
||||
MapContainer* self = GetMap(_self);
|
||||
MapContainer* other_map = GetMap(arg);
|
||||
Message* message = self->GetMutableMessage();
|
||||
const Message* other_message = other_map->message;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
const Reflection* other_reflection = other_message->GetReflection();
|
||||
int count = other_reflection->FieldSize(
|
||||
*other_message, other_map->parent_field_descriptor);
|
||||
for (int i = 0 ; i < count; i ++) {
|
||||
reflection->AddMessage(message, self->parent_field_descriptor)->MergeFrom(
|
||||
other_reflection->GetRepeatedMessage(
|
||||
*other_message, other_map->parent_field_descriptor, i));
|
||||
}
|
||||
self->version++;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
PyObject* MapReflectionFriend::Contains(PyObject* _self, PyObject* key) {
|
||||
MapContainer* self = GetMap(_self);
|
||||
|
||||
@@ -535,6 +550,8 @@ static PyMethodDef ScalarMapMethods[] = {
|
||||
"Gets the value for the given key if present, or otherwise a default" },
|
||||
{ "GetEntryClass", (PyCFunction)GetEntryClass, METH_NOARGS,
|
||||
"Return the class used to build Entries of (key, value) pairs." },
|
||||
{ "MergeFrom", (PyCFunction)MergeFrom, METH_O,
|
||||
"Merges a map into the current map." },
|
||||
/*
|
||||
{ "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
|
||||
"Makes a deep copy of the class." },
|
||||
@@ -810,6 +827,8 @@ static PyMethodDef MessageMapMethods[] = {
|
||||
"Alias for getitem, useful to make explicit that the map is mutated." },
|
||||
{ "GetEntryClass", (PyCFunction)GetEntryClass, METH_NOARGS,
|
||||
"Return the class used to build Entries of (key, value) pairs." },
|
||||
{ "MergeFrom", (PyCFunction)MergeFrom, METH_O,
|
||||
"Merges a map into the current map." },
|
||||
/*
|
||||
{ "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
|
||||
"Makes a deep copy of the class." },
|
||||
|
||||
@@ -34,27 +34,18 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/message.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
|
||||
class Message;
|
||||
|
||||
#ifdef _SHARED_PTR_H
|
||||
using std::shared_ptr;
|
||||
#else
|
||||
using internal::shared_ptr;
|
||||
#endif
|
||||
|
||||
namespace python {
|
||||
|
||||
struct CMessage;
|
||||
struct CMessageClass;
|
||||
|
||||
// This struct is used directly for ScalarMap, and is the base class of
|
||||
@@ -66,7 +57,7 @@ struct MapContainer {
|
||||
// proto tree. Every Python MapContainer holds a
|
||||
// reference to it in order to keep it alive as long as there's a
|
||||
// Python object that references any part of the tree.
|
||||
shared_ptr<Message> owner;
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// Pointer to the C++ Message that contains this container. The
|
||||
// MapContainer does not own this pointer.
|
||||
@@ -99,9 +90,7 @@ struct MapContainer {
|
||||
int Release();
|
||||
|
||||
// Set the owner field of self and any children of self.
|
||||
void SetOwner(const shared_ptr<Message>& new_owner) {
|
||||
owner = new_owner;
|
||||
}
|
||||
void SetOwner(const CMessage::OwnerRef& new_owner) { owner = new_owner; }
|
||||
};
|
||||
|
||||
struct MessageMapContainer : public MapContainer {
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <structmember.h> // A Python header file.
|
||||
@@ -605,18 +602,16 @@ 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();
|
||||
OutOfRangeError(arg);
|
||||
} // Otherwise propagate existing error.
|
||||
return false;
|
||||
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)) {
|
||||
if (GOOGLE_PREDICT_FALSE(!IsValidNumericCast<RangeType>(value))) {
|
||||
OutOfRangeError(arg);
|
||||
return false;
|
||||
}
|
||||
@@ -628,26 +623,22 @@ 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)) {
|
||||
if (GOOGLE_PREDICT_FALSE(!PyIndex_Check(arg))) {
|
||||
FormatTypeError(arg, "int, long");
|
||||
return false;
|
||||
}
|
||||
@@ -664,10 +655,9 @@ 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 == nullptr)) {
|
||||
// Propagate existing error.
|
||||
return false;
|
||||
}
|
||||
ulong_result = PyLong_AsUnsignedLongLong(casted);
|
||||
Py_DECREF(casted);
|
||||
@@ -690,10 +680,9 @@ 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 == nullptr)) {
|
||||
// Propagate existing error.
|
||||
return false;
|
||||
}
|
||||
long_result = PyLong_AsLongLong(casted);
|
||||
Py_DECREF(casted);
|
||||
@@ -717,10 +706,9 @@ 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;
|
||||
}
|
||||
@@ -839,7 +827,8 @@ bool CheckAndSetString(
|
||||
return true;
|
||||
}
|
||||
|
||||
PyObject* ToStringObject(const FieldDescriptor* descriptor, string value) {
|
||||
PyObject* ToStringObject(const FieldDescriptor* descriptor,
|
||||
const string& value) {
|
||||
if (descriptor->type() != FieldDescriptor::TYPE_STRING) {
|
||||
return PyBytes_FromStringAndSize(value.c_str(), value.length());
|
||||
}
|
||||
@@ -1187,7 +1176,7 @@ int InitAttributes(CMessage* self, PyObject* args, PyObject* kwargs) {
|
||||
continue;
|
||||
}
|
||||
if (descriptor->is_map()) {
|
||||
ScopedPyObjectPtr map(GetAttr(self, name));
|
||||
ScopedPyObjectPtr map(GetAttr(reinterpret_cast<PyObject*>(self), name));
|
||||
const FieldDescriptor* value_descriptor =
|
||||
descriptor->message_type()->FindFieldByName("value");
|
||||
if (value_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
|
||||
@@ -1215,7 +1204,8 @@ int InitAttributes(CMessage* self, PyObject* args, PyObject* kwargs) {
|
||||
}
|
||||
}
|
||||
} else if (descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
|
||||
ScopedPyObjectPtr container(GetAttr(self, name));
|
||||
ScopedPyObjectPtr container(
|
||||
GetAttr(reinterpret_cast<PyObject*>(self), name));
|
||||
if (container == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@@ -1282,7 +1272,8 @@ int InitAttributes(CMessage* self, PyObject* args, PyObject* kwargs) {
|
||||
}
|
||||
}
|
||||
} else if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
|
||||
ScopedPyObjectPtr message(GetAttr(self, name));
|
||||
ScopedPyObjectPtr message(
|
||||
GetAttr(reinterpret_cast<PyObject*>(self), name));
|
||||
if (message == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@@ -1307,8 +1298,8 @@ int InitAttributes(CMessage* self, PyObject* args, PyObject* kwargs) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
if (SetAttr(self, name, (new_val.get() == NULL) ? value : new_val.get()) <
|
||||
0) {
|
||||
if (SetAttr(reinterpret_cast<PyObject*>(self), name,
|
||||
(new_val.get() == NULL) ? value : new_val.get()) < 0) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -1325,6 +1316,8 @@ CMessage* NewEmptyMessage(CMessageClass* type) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Use "placement new" syntax to initialize the C++ object.
|
||||
new (&self->owner) CMessage::OwnerRef(NULL);
|
||||
self->message = NULL;
|
||||
self->parent = NULL;
|
||||
self->parent_field_descriptor = NULL;
|
||||
@@ -1421,7 +1414,7 @@ static void Dealloc(CMessage* self) {
|
||||
|
||||
Py_CLEAR(self->extensions);
|
||||
Py_CLEAR(self->composite_fields);
|
||||
self->owner.reset();
|
||||
self->owner.~ThreadUnsafeSharedPtr<Message>();
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
}
|
||||
|
||||
@@ -1623,9 +1616,10 @@ PyObject* HasExtension(CMessage* self, PyObject* extension) {
|
||||
// * Clear the weak references from the released container to the
|
||||
// parent.
|
||||
|
||||
struct SetOwnerVisitor : public ChildVisitor {
|
||||
class SetOwnerVisitor : public ChildVisitor {
|
||||
public:
|
||||
// new_owner must outlive this object.
|
||||
explicit SetOwnerVisitor(const shared_ptr<Message>& new_owner)
|
||||
explicit SetOwnerVisitor(const CMessage::OwnerRef& new_owner)
|
||||
: new_owner_(new_owner) {}
|
||||
|
||||
int VisitRepeatedCompositeContainer(RepeatedCompositeContainer* container) {
|
||||
@@ -1649,11 +1643,11 @@ struct SetOwnerVisitor : public ChildVisitor {
|
||||
}
|
||||
|
||||
private:
|
||||
const shared_ptr<Message>& new_owner_;
|
||||
const CMessage::OwnerRef& new_owner_;
|
||||
};
|
||||
|
||||
// Change the owner of this CMessage and all its children, recursively.
|
||||
int SetOwner(CMessage* self, const shared_ptr<Message>& new_owner) {
|
||||
int SetOwner(CMessage* self, const CMessage::OwnerRef& new_owner) {
|
||||
self->owner = new_owner;
|
||||
if (ForEachCompositeField(self, SetOwnerVisitor(new_owner)) == -1)
|
||||
return -1;
|
||||
@@ -1686,7 +1680,7 @@ int ReleaseSubMessage(CMessage* self,
|
||||
const FieldDescriptor* field_descriptor,
|
||||
CMessage* child_cmessage) {
|
||||
// Release the Message
|
||||
shared_ptr<Message> released_message(ReleaseMessage(
|
||||
CMessage::OwnerRef released_message(ReleaseMessage(
|
||||
self, child_cmessage->message->GetDescriptor(), field_descriptor));
|
||||
child_cmessage->message = released_message.get();
|
||||
child_cmessage->owner.swap(released_message);
|
||||
@@ -2211,7 +2205,8 @@ static PyObject* ListFields(CMessage* self) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PyObject* field_value = GetAttr(self, py_field_name.get());
|
||||
PyObject* field_value =
|
||||
GetAttr(reinterpret_cast<PyObject*>(self), py_field_name.get());
|
||||
if (field_value == NULL) {
|
||||
PyErr_SetObject(PyExc_ValueError, py_field_name.get());
|
||||
return NULL;
|
||||
@@ -2335,7 +2330,9 @@ PyObject* InternalGetScalar(const Message* message,
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_STRING: {
|
||||
string value = reflection->GetString(*message, field_descriptor);
|
||||
string scratch;
|
||||
const string& value =
|
||||
reflection->GetStringReference(*message, field_descriptor, &scratch);
|
||||
result = ToStringObject(field_descriptor, value);
|
||||
break;
|
||||
}
|
||||
@@ -2707,7 +2704,8 @@ static bool SetCompositeField(
|
||||
return PyDict_SetItem(self->composite_fields, name, value) == 0;
|
||||
}
|
||||
|
||||
PyObject* GetAttr(CMessage* self, PyObject* name) {
|
||||
PyObject* GetAttr(PyObject* pself, PyObject* name) {
|
||||
CMessage* self = reinterpret_cast<CMessage*>(pself);
|
||||
PyObject* value = self->composite_fields ?
|
||||
PyDict_GetItem(self->composite_fields, name) : NULL;
|
||||
if (value != NULL) {
|
||||
@@ -2785,7 +2783,8 @@ PyObject* GetAttr(CMessage* self, PyObject* name) {
|
||||
return InternalGetScalar(self->message, field_descriptor);
|
||||
}
|
||||
|
||||
int SetAttr(CMessage* self, PyObject* name, PyObject* value) {
|
||||
int SetAttr(PyObject* pself, PyObject* name, PyObject* value) {
|
||||
CMessage* self = reinterpret_cast<CMessage*>(pself);
|
||||
if (self->composite_fields && PyDict_Contains(self->composite_fields, name)) {
|
||||
PyErr_SetString(PyExc_TypeError, "Can't set composite field");
|
||||
return -1;
|
||||
@@ -2837,8 +2836,8 @@ PyTypeObject CMessage_Type = {
|
||||
PyObject_HashNotImplemented, // tp_hash
|
||||
0, // tp_call
|
||||
(reprfunc)cmessage::ToStr, // tp_str
|
||||
(getattrofunc)cmessage::GetAttr, // tp_getattro
|
||||
(setattrofunc)cmessage::SetAttr, // tp_setattro
|
||||
cmessage::GetAttr, // tp_getattro
|
||||
cmessage::SetAttr, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, // tp_flags
|
||||
"A ProtocolMessage", // tp_doc
|
||||
|
||||
@@ -37,11 +37,11 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/pyext/thread_unsafe_shared_ptr.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
|
||||
@@ -52,13 +52,6 @@ class Descriptor;
|
||||
class DescriptorPool;
|
||||
class MessageFactory;
|
||||
|
||||
#ifdef _SHARED_PTR_H
|
||||
using std::shared_ptr;
|
||||
using std::string;
|
||||
#else
|
||||
using internal::shared_ptr;
|
||||
#endif
|
||||
|
||||
namespace python {
|
||||
|
||||
struct ExtensionDict;
|
||||
@@ -71,7 +64,9 @@ typedef struct CMessage {
|
||||
// proto tree. Every Python CMessage holds a reference to it in
|
||||
// order to keep it alive as long as there's a Python object that
|
||||
// references any part of the tree.
|
||||
shared_ptr<Message> owner;
|
||||
|
||||
typedef ThreadUnsafeSharedPtr<Message> OwnerRef;
|
||||
OwnerRef owner;
|
||||
|
||||
// Weak reference to a parent CMessage object. This is NULL for any top-level
|
||||
// message and is set for any child message (i.e. a child submessage or a
|
||||
@@ -240,22 +235,22 @@ PyObject* MergeFrom(CMessage* self, PyObject* arg);
|
||||
// has been registered with the same field number on this class.
|
||||
PyObject* RegisterExtension(PyObject* cls, PyObject* extension_handle);
|
||||
|
||||
// Retrieves an attribute named 'name' from CMessage 'self'. Returns
|
||||
// the attribute value on success, or NULL on failure.
|
||||
// Retrieves an attribute named 'name' from 'self', which is interpreted as a
|
||||
// CMessage. Returns the attribute value on success, or null on failure.
|
||||
//
|
||||
// Returns a new reference.
|
||||
PyObject* GetAttr(CMessage* self, PyObject* name);
|
||||
PyObject* GetAttr(PyObject* self, PyObject* name);
|
||||
|
||||
// Set the value of the attribute named 'name', for CMessage 'self',
|
||||
// to the value 'value'. Returns -1 on failure.
|
||||
int SetAttr(CMessage* self, PyObject* name, PyObject* value);
|
||||
// Set the value of the attribute named 'name', for 'self', which is interpreted
|
||||
// as a CMessage, to the value 'value'. Returns -1 on failure.
|
||||
int SetAttr(PyObject* self, PyObject* name, PyObject* value);
|
||||
|
||||
PyObject* FindInitializationErrors(CMessage* self);
|
||||
|
||||
// Set the owner field of self and any children of self, recursively.
|
||||
// Used when self is being released and thus has a new owner (the
|
||||
// released Message.)
|
||||
int SetOwner(CMessage* self, const shared_ptr<Message>& new_owner);
|
||||
int SetOwner(CMessage* self, const CMessage::OwnerRef& new_owner);
|
||||
|
||||
int AssureWritable(CMessage* self);
|
||||
|
||||
@@ -336,7 +331,8 @@ bool CheckAndSetString(
|
||||
const Reflection* reflection,
|
||||
bool append,
|
||||
int index);
|
||||
PyObject* ToStringObject(const FieldDescriptor* descriptor, string value);
|
||||
PyObject* ToStringObject(const FieldDescriptor* descriptor,
|
||||
const string& value);
|
||||
|
||||
// Check if the passed field descriptor belongs to the given message.
|
||||
// If not, return false and set a Python exception (a KeyError)
|
||||
@@ -347,6 +343,15 @@ extern PyObject* PickleError_class;
|
||||
|
||||
bool InitProto2MessageModule(PyObject *m);
|
||||
|
||||
#if LANG_CXX11
|
||||
// These are referenced by repeated_scalar_container, and must
|
||||
// be explicitly instantiated.
|
||||
extern template bool CheckAndGetInteger<int32>(PyObject*, int32*);
|
||||
extern template bool CheckAndGetInteger<int64>(PyObject*, int64*);
|
||||
extern template bool CheckAndGetInteger<uint32>(PyObject*, uint32*);
|
||||
extern template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
|
||||
#endif
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
|
||||
@@ -100,7 +100,9 @@ PyObject* New(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
|
||||
NewMessageFactory(type, reinterpret_cast<PyDescriptorPool*>(pool)));
|
||||
}
|
||||
|
||||
static void Dealloc(PyMessageFactory* self) {
|
||||
static void Dealloc(PyObject* pself) {
|
||||
PyMessageFactory* self = reinterpret_cast<PyMessageFactory*>(pself);
|
||||
|
||||
// TODO(amauryfa): When the MessageFactory is not created from the
|
||||
// DescriptorPool this reference should be owned, not borrowed.
|
||||
// Py_CLEAR(self->pool);
|
||||
@@ -111,7 +113,7 @@ static void Dealloc(PyMessageFactory* self) {
|
||||
}
|
||||
delete self->classes_by_descriptor;
|
||||
delete self->message_factory;
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
Py_TYPE(self)->tp_free(pself);
|
||||
}
|
||||
|
||||
// Add a message class to our database.
|
||||
@@ -231,7 +233,7 @@ PyTypeObject PyMessageFactory_Type = {
|
||||
".MessageFactory", // tp_name
|
||||
sizeof(PyMessageFactory), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)message_factory::Dealloc, // tp_dealloc
|
||||
message_factory::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/pyext/python.proto',
|
||||
package='google.protobuf.python.internal',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('H\001'),
|
||||
serialized_pb=_b('\n\"google/protobuf/pyext/python.proto\x12\x1fgoogle.protobuf.python.internal\"\xbc\x02\n\x0cTestAllTypes\x12\\\n\x17repeated_nested_message\x18\x01 \x03(\x0b\x32;.google.protobuf.python.internal.TestAllTypes.NestedMessage\x12\\\n\x17optional_nested_message\x18\x02 \x01(\x0b\x32;.google.protobuf.python.internal.TestAllTypes.NestedMessage\x12\x16\n\x0eoptional_int32\x18\x03 \x01(\x05\x1aX\n\rNestedMessage\x12\n\n\x02\x62\x62\x18\x01 \x01(\x05\x12;\n\x02\x63\x63\x18\x02 \x01(\x0b\x32/.google.protobuf.python.internal.ForeignMessage\"&\n\x0e\x46oreignMessage\x12\t\n\x01\x63\x18\x01 \x01(\x05\x12\t\n\x01\x64\x18\x02 \x03(\x05\"\x1d\n\x11TestAllExtensions*\x08\x08\x01\x10\x80\x80\x80\x80\x02:\x9a\x01\n!optional_nested_message_extension\x12\x32.google.protobuf.python.internal.TestAllExtensions\x18\x01 \x01(\x0b\x32;.google.protobuf.python.internal.TestAllTypes.NestedMessage:\x9a\x01\n!repeated_nested_message_extension\x12\x32.google.protobuf.python.internal.TestAllExtensions\x18\x02 \x03(\x0b\x32;.google.protobuf.python.internal.TestAllTypes.NestedMessageB\x02H\x01')
|
||||
)
|
||||
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTALLTYPES_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
@@ -54,21 +54,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -91,28 +91,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTALLTYPES_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -136,21 +136,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -174,7 +174,7 @@ _TESTALLEXTENSIONS = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1, 536870912), ],
|
||||
@@ -229,6 +229,5 @@ TestAllExtensions.RegisterExtension(optional_nested_message_extension)
|
||||
repeated_nested_message_extension.message_type = _TESTALLTYPES_NESTEDMESSAGE
|
||||
TestAllExtensions.RegisterExtension(repeated_nested_message_extension)
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\001'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -34,9 +34,6 @@
|
||||
#include <google/protobuf/pyext/repeated_composite_container.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>
|
||||
@@ -81,7 +78,10 @@ namespace repeated_composite_container {
|
||||
// ---------------------------------------------------------------------
|
||||
// len()
|
||||
|
||||
static Py_ssize_t Length(RepeatedCompositeContainer* self) {
|
||||
static Py_ssize_t Length(PyObject* pself) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
Message* message = self->message;
|
||||
if (message != NULL) {
|
||||
return message->GetReflection()->FieldSize(*message,
|
||||
@@ -102,7 +102,7 @@ static int UpdateChildMessages(RepeatedCompositeContainer* self) {
|
||||
// A MergeFrom on a parent message could have caused extra messages to be
|
||||
// added in the underlying protobuf so add them to our list. They can never
|
||||
// be removed in such a way so there's no need to worry about that.
|
||||
Py_ssize_t message_length = Length(self);
|
||||
Py_ssize_t message_length = Length(reinterpret_cast<PyObject*>(self));
|
||||
Py_ssize_t child_length = PyList_GET_SIZE(self->child_messages);
|
||||
Message* message = self->message;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
@@ -191,6 +191,10 @@ PyObject* Add(RepeatedCompositeContainer* self,
|
||||
return AddToAttached(self, args, kwargs);
|
||||
}
|
||||
|
||||
static PyObject* AddMethod(PyObject* self, PyObject* args, PyObject* kwargs) {
|
||||
return Add(reinterpret_cast<RepeatedCompositeContainer*>(self), args, kwargs);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// extend()
|
||||
|
||||
@@ -226,6 +230,10 @@ PyObject* Extend(RepeatedCompositeContainer* self, PyObject* value) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject* ExtendMethod(PyObject* self, PyObject* value) {
|
||||
return Extend(reinterpret_cast<RepeatedCompositeContainer*>(self), value);
|
||||
}
|
||||
|
||||
PyObject* MergeFrom(RepeatedCompositeContainer* self, PyObject* other) {
|
||||
if (UpdateChildMessages(self) < 0) {
|
||||
return NULL;
|
||||
@@ -233,6 +241,10 @@ PyObject* MergeFrom(RepeatedCompositeContainer* self, PyObject* other) {
|
||||
return Extend(self, other);
|
||||
}
|
||||
|
||||
static PyObject* MergeFromMethod(PyObject* self, PyObject* other) {
|
||||
return MergeFrom(reinterpret_cast<RepeatedCompositeContainer*>(self), other);
|
||||
}
|
||||
|
||||
PyObject* Subscript(RepeatedCompositeContainer* self, PyObject* slice) {
|
||||
if (UpdateChildMessages(self) < 0) {
|
||||
return NULL;
|
||||
@@ -242,6 +254,10 @@ PyObject* Subscript(RepeatedCompositeContainer* self, PyObject* slice) {
|
||||
return PyObject_GetItem(self->child_messages, slice);
|
||||
}
|
||||
|
||||
static PyObject* SubscriptMethod(PyObject* self, PyObject* slice) {
|
||||
return Subscript(reinterpret_cast<RepeatedCompositeContainer*>(self), slice);
|
||||
}
|
||||
|
||||
int AssignSubscript(RepeatedCompositeContainer* self,
|
||||
PyObject* slice,
|
||||
PyObject* value) {
|
||||
@@ -265,7 +281,7 @@ int AssignSubscript(RepeatedCompositeContainer* self,
|
||||
Py_ssize_t from;
|
||||
Py_ssize_t to;
|
||||
Py_ssize_t step;
|
||||
Py_ssize_t length = Length(self);
|
||||
Py_ssize_t length = Length(reinterpret_cast<PyObject*>(self));
|
||||
Py_ssize_t slicelength;
|
||||
if (PySlice_Check(slice)) {
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
@@ -290,7 +306,16 @@ int AssignSubscript(RepeatedCompositeContainer* self,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyObject* Remove(RepeatedCompositeContainer* self, PyObject* value) {
|
||||
static int AssignSubscriptMethod(PyObject* self, PyObject* slice,
|
||||
PyObject* value) {
|
||||
return AssignSubscript(reinterpret_cast<RepeatedCompositeContainer*>(self),
|
||||
slice, value);
|
||||
}
|
||||
|
||||
static PyObject* Remove(PyObject* pself, PyObject* value) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
if (UpdateChildMessages(self) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -305,9 +330,10 @@ static PyObject* Remove(RepeatedCompositeContainer* self, PyObject* value) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject* RichCompare(RepeatedCompositeContainer* self,
|
||||
PyObject* other,
|
||||
int opid) {
|
||||
static PyObject* RichCompare(PyObject* pself, PyObject* other, int opid) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
if (UpdateChildMessages(self) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -340,12 +366,13 @@ static PyObject* RichCompare(RepeatedCompositeContainer* self,
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject* ToStr(RepeatedCompositeContainer* self) {
|
||||
static PyObject* ToStr(PyObject* pself) {
|
||||
ScopedPyObjectPtr full_slice(PySlice_New(NULL, NULL, NULL));
|
||||
if (full_slice == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
|
||||
ScopedPyObjectPtr list(Subscript(
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself), full_slice.get()));
|
||||
if (list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -359,7 +386,7 @@ static void ReorderAttached(RepeatedCompositeContainer* self) {
|
||||
Message* message = self->message;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
const FieldDescriptor* descriptor = self->parent_field_descriptor;
|
||||
const Py_ssize_t length = Length(self);
|
||||
const Py_ssize_t length = Length(reinterpret_cast<PyObject*>(self));
|
||||
|
||||
// Since Python protobuf objects are never arena-allocated, adding and
|
||||
// removing message pointers to the underlying array is just updating
|
||||
@@ -390,9 +417,10 @@ static int SortPythonMessages(RepeatedCompositeContainer* self,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyObject* Sort(RepeatedCompositeContainer* self,
|
||||
PyObject* args,
|
||||
PyObject* kwds) {
|
||||
static PyObject* Sort(PyObject* pself, PyObject* args, PyObject* kwds) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
// Support the old sort_function argument for backwards
|
||||
// compatibility.
|
||||
if (kwds != NULL) {
|
||||
@@ -416,11 +444,14 @@ static PyObject* Sort(RepeatedCompositeContainer* self,
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
static PyObject* Item(RepeatedCompositeContainer* self, Py_ssize_t index) {
|
||||
static PyObject* Item(PyObject* pself, Py_ssize_t index) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
if (UpdateChildMessages(self) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
Py_ssize_t length = Length(self);
|
||||
Py_ssize_t length = Length(pself);
|
||||
if (index < 0) {
|
||||
index = length + index;
|
||||
}
|
||||
@@ -432,17 +463,17 @@ static PyObject* Item(RepeatedCompositeContainer* self, Py_ssize_t index) {
|
||||
return item;
|
||||
}
|
||||
|
||||
static PyObject* Pop(RepeatedCompositeContainer* self,
|
||||
PyObject* args) {
|
||||
static PyObject* Pop(PyObject* pself, PyObject* args) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
Py_ssize_t index = -1;
|
||||
if (!PyArg_ParseTuple(args, "|n", &index)) {
|
||||
return NULL;
|
||||
}
|
||||
PyObject* item = Item(self, index);
|
||||
PyObject* item = Item(pself, index);
|
||||
if (item == NULL) {
|
||||
PyErr_Format(PyExc_IndexError,
|
||||
"list index (%zd) out of range",
|
||||
index);
|
||||
PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr py_index(PyLong_FromSsize_t(index));
|
||||
@@ -460,7 +491,7 @@ void ReleaseLastTo(CMessage* parent,
|
||||
GOOGLE_CHECK_NOTNULL(field);
|
||||
GOOGLE_CHECK_NOTNULL(target);
|
||||
|
||||
shared_ptr<Message> released_message(
|
||||
CMessage::OwnerRef released_message(
|
||||
parent->message->GetReflection()->ReleaseLast(parent->message, field));
|
||||
// TODO(tibell): Deal with proto1.
|
||||
|
||||
@@ -503,7 +534,10 @@ int Release(RepeatedCompositeContainer* self) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
PyObject* DeepCopy(RepeatedCompositeContainer* self, PyObject* arg) {
|
||||
PyObject* DeepCopy(PyObject* pself, PyObject* arg) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
ScopedPyObjectPtr cloneObj(
|
||||
PyType_GenericAlloc(&RepeatedCompositeContainer_Type, 0));
|
||||
if (cloneObj == NULL) {
|
||||
@@ -530,7 +564,7 @@ PyObject* DeepCopy(RepeatedCompositeContainer* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
int SetOwner(RepeatedCompositeContainer* self,
|
||||
const shared_ptr<Message>& new_owner) {
|
||||
const CMessage::OwnerRef& new_owner) {
|
||||
GOOGLE_CHECK_ATTACHED(self);
|
||||
|
||||
self->owner = new_owner;
|
||||
@@ -571,43 +605,46 @@ PyObject *NewContainer(
|
||||
return reinterpret_cast<PyObject*>(self);
|
||||
}
|
||||
|
||||
static void Dealloc(RepeatedCompositeContainer* self) {
|
||||
static void Dealloc(PyObject* pself) {
|
||||
RepeatedCompositeContainer* self =
|
||||
reinterpret_cast<RepeatedCompositeContainer*>(pself);
|
||||
|
||||
Py_CLEAR(self->child_messages);
|
||||
Py_CLEAR(self->child_message_class);
|
||||
// TODO(tibell): Do we need to call delete on these objects to make
|
||||
// sure their destructors are called?
|
||||
self->owner.reset();
|
||||
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
Py_TYPE(self)->tp_free(pself);
|
||||
}
|
||||
|
||||
static PySequenceMethods SqMethods = {
|
||||
(lenfunc)Length, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
0, /* sq_repeat */
|
||||
(ssizeargfunc)Item /* sq_item */
|
||||
Length, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
0, /* sq_repeat */
|
||||
Item /* sq_item */
|
||||
};
|
||||
|
||||
static PyMappingMethods MpMethods = {
|
||||
(lenfunc)Length, /* mp_length */
|
||||
(binaryfunc)Subscript, /* mp_subscript */
|
||||
(objobjargproc)AssignSubscript,/* mp_ass_subscript */
|
||||
Length, /* mp_length */
|
||||
SubscriptMethod, /* mp_subscript */
|
||||
AssignSubscriptMethod, /* mp_ass_subscript */
|
||||
};
|
||||
|
||||
static PyMethodDef Methods[] = {
|
||||
{ "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
|
||||
{ "__deepcopy__", DeepCopy, METH_VARARGS,
|
||||
"Makes a deep copy of the class." },
|
||||
{ "add", (PyCFunction) Add, METH_VARARGS | METH_KEYWORDS,
|
||||
{ "add", (PyCFunction)AddMethod, METH_VARARGS | METH_KEYWORDS,
|
||||
"Adds an object to the repeated container." },
|
||||
{ "extend", (PyCFunction) Extend, METH_O,
|
||||
{ "extend", ExtendMethod, METH_O,
|
||||
"Adds objects to the repeated container." },
|
||||
{ "pop", (PyCFunction)Pop, METH_VARARGS,
|
||||
{ "pop", Pop, METH_VARARGS,
|
||||
"Removes an object from the repeated container and returns it." },
|
||||
{ "remove", (PyCFunction) Remove, METH_O,
|
||||
{ "remove", Remove, METH_O,
|
||||
"Removes an object from the repeated container." },
|
||||
{ "sort", (PyCFunction) Sort, METH_VARARGS | METH_KEYWORDS,
|
||||
{ "sort", (PyCFunction)Sort, METH_VARARGS | METH_KEYWORDS,
|
||||
"Sorts the repeated container." },
|
||||
{ "MergeFrom", (PyCFunction) MergeFrom, METH_O,
|
||||
{ "MergeFrom", MergeFromMethod, METH_O,
|
||||
"Adds objects to the repeated container." },
|
||||
{ NULL, NULL }
|
||||
};
|
||||
@@ -619,12 +656,12 @@ PyTypeObject RepeatedCompositeContainer_Type = {
|
||||
FULL_MODULE_NAME ".RepeatedCompositeContainer", // tp_name
|
||||
sizeof(RepeatedCompositeContainer), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)repeated_composite_container::Dealloc, // tp_dealloc
|
||||
repeated_composite_container::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
(reprfunc)repeated_composite_container::ToStr, // tp_repr
|
||||
repeated_composite_container::ToStr, // tp_repr
|
||||
0, // tp_as_number
|
||||
&repeated_composite_container::SqMethods, // tp_as_sequence
|
||||
&repeated_composite_container::MpMethods, // tp_as_mapping
|
||||
@@ -638,7 +675,7 @@ PyTypeObject RepeatedCompositeContainer_Type = {
|
||||
"A Repeated scalar container", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
(richcmpfunc)repeated_composite_container::RichCompare, // tp_richcompare
|
||||
repeated_composite_container::RichCompare, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
|
||||
@@ -37,27 +37,19 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
|
||||
class FieldDescriptor;
|
||||
class Message;
|
||||
|
||||
#ifdef _SHARED_PTR_H
|
||||
using std::shared_ptr;
|
||||
#else
|
||||
using internal::shared_ptr;
|
||||
#endif
|
||||
|
||||
namespace python {
|
||||
|
||||
struct CMessage;
|
||||
struct CMessageClass;
|
||||
|
||||
// A RepeatedCompositeContainer can be in one of two states: attached
|
||||
@@ -77,7 +69,7 @@ typedef struct RepeatedCompositeContainer {
|
||||
// proto tree. Every Python RepeatedCompositeContainer holds a
|
||||
// reference to it in order to keep it alive as long as there's a
|
||||
// Python object that references any part of the tree.
|
||||
shared_ptr<Message> owner;
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// Weak reference to parent object. May be NULL. Used to make sure
|
||||
// the parent is writable before modifying the
|
||||
@@ -148,11 +140,6 @@ int AssignSubscript(RepeatedCompositeContainer* self,
|
||||
PyObject* slice,
|
||||
PyObject* value);
|
||||
|
||||
// Releases the messages in the container to the given message.
|
||||
//
|
||||
// Returns 0 on success, -1 on failure.
|
||||
int ReleaseToMessage(RepeatedCompositeContainer* self, Message* new_message);
|
||||
|
||||
// Releases the messages in the container to a new message.
|
||||
//
|
||||
// Returns 0 on success, -1 on failure.
|
||||
@@ -160,7 +147,7 @@ int Release(RepeatedCompositeContainer* self);
|
||||
|
||||
// Returns 0 on success, -1 on failure.
|
||||
int SetOwner(RepeatedCompositeContainer* self,
|
||||
const shared_ptr<Message>& new_owner);
|
||||
const CMessage::OwnerRef& new_owner);
|
||||
|
||||
// Removes the last element of the repeated message field 'field' on
|
||||
// the Message 'parent', and transfers the ownership of the released
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
#include <google/protobuf/pyext/repeated_scalar_container.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
@@ -77,15 +74,18 @@ static int InternalAssignRepeatedField(
|
||||
return 0;
|
||||
}
|
||||
|
||||
static Py_ssize_t Len(RepeatedScalarContainer* self) {
|
||||
static Py_ssize_t Len(PyObject* pself) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
Message* message = self->message;
|
||||
return message->GetReflection()->FieldSize(*message,
|
||||
self->parent_field_descriptor);
|
||||
}
|
||||
|
||||
static int AssignItem(RepeatedScalarContainer* self,
|
||||
Py_ssize_t index,
|
||||
PyObject* arg) {
|
||||
static int AssignItem(PyObject* pself, Py_ssize_t index, PyObject* arg) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
|
||||
cmessage::AssureWritable(self->parent);
|
||||
Message* message = self->message;
|
||||
const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
|
||||
@@ -188,7 +188,10 @@ static int AssignItem(RepeatedScalarContainer* self,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyObject* Item(RepeatedScalarContainer* self, Py_ssize_t index) {
|
||||
static PyObject* Item(PyObject* pself, Py_ssize_t index) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
|
||||
Message* message = self->message;
|
||||
const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
@@ -256,8 +259,9 @@ static PyObject* Item(RepeatedScalarContainer* self, Py_ssize_t index) {
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_STRING: {
|
||||
string value = reflection->GetRepeatedString(
|
||||
*message, field_descriptor, index);
|
||||
string scratch;
|
||||
const string& value = reflection->GetRepeatedStringReference(
|
||||
*message, field_descriptor, index, &scratch);
|
||||
result = ToStringObject(field_descriptor, value);
|
||||
break;
|
||||
}
|
||||
@@ -271,7 +275,7 @@ static PyObject* Item(RepeatedScalarContainer* self, Py_ssize_t index) {
|
||||
return result;
|
||||
}
|
||||
|
||||
static PyObject* Subscript(RepeatedScalarContainer* self, PyObject* slice) {
|
||||
static PyObject* Subscript(PyObject* pself, PyObject* slice) {
|
||||
Py_ssize_t from;
|
||||
Py_ssize_t to;
|
||||
Py_ssize_t step;
|
||||
@@ -286,14 +290,13 @@ static PyObject* Subscript(RepeatedScalarContainer* self, PyObject* slice) {
|
||||
if (PyLong_Check(slice)) {
|
||||
from = to = PyLong_AsLong(slice);
|
||||
} else if (PySlice_Check(slice)) {
|
||||
length = Len(self);
|
||||
length = Len(pself);
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
if (PySlice_GetIndicesEx(slice,
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
#else
|
||||
if (PySlice_GetIndicesEx(reinterpret_cast<PySliceObject*>(slice),
|
||||
length, &from, &to, &step, &slicelength) == -1) {
|
||||
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
@@ -304,7 +307,7 @@ static PyObject* Subscript(RepeatedScalarContainer* self, PyObject* slice) {
|
||||
}
|
||||
|
||||
if (!return_list) {
|
||||
return Item(self, from);
|
||||
return Item(pself, from);
|
||||
}
|
||||
|
||||
PyObject* list = PyList_New(0);
|
||||
@@ -319,7 +322,7 @@ static PyObject* Subscript(RepeatedScalarContainer* self, PyObject* slice) {
|
||||
if (index < 0 || index >= length) {
|
||||
break;
|
||||
}
|
||||
ScopedPyObjectPtr s(Item(self, index));
|
||||
ScopedPyObjectPtr s(Item(pself, index));
|
||||
PyList_Append(list, s.get());
|
||||
}
|
||||
} else {
|
||||
@@ -330,7 +333,7 @@ static PyObject* Subscript(RepeatedScalarContainer* self, PyObject* slice) {
|
||||
if (index < 0 || index >= length) {
|
||||
break;
|
||||
}
|
||||
ScopedPyObjectPtr s(Item(self, index));
|
||||
ScopedPyObjectPtr s(Item(pself, index));
|
||||
PyList_Append(list, s.get());
|
||||
}
|
||||
}
|
||||
@@ -417,9 +420,14 @@ PyObject* Append(RepeatedScalarContainer* self, PyObject* item) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static int AssSubscript(RepeatedScalarContainer* self,
|
||||
PyObject* slice,
|
||||
PyObject* value) {
|
||||
static PyObject* AppendMethod(PyObject* self, PyObject* item) {
|
||||
return Append(reinterpret_cast<RepeatedScalarContainer*>(self), item);
|
||||
}
|
||||
|
||||
static int AssSubscript(PyObject* pself, PyObject* slice, PyObject* value) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
|
||||
Py_ssize_t from;
|
||||
Py_ssize_t to;
|
||||
Py_ssize_t step;
|
||||
@@ -435,7 +443,7 @@ static int AssSubscript(RepeatedScalarContainer* self,
|
||||
#if PY_MAJOR_VERSION < 3
|
||||
if (PyInt_Check(slice)) {
|
||||
from = to = PyInt_AsLong(slice);
|
||||
} else
|
||||
} else // NOLINT
|
||||
#endif
|
||||
if (PyLong_Check(slice)) {
|
||||
from = to = PyLong_AsLong(slice);
|
||||
@@ -463,14 +471,14 @@ static int AssSubscript(RepeatedScalarContainer* self,
|
||||
}
|
||||
|
||||
if (!create_list) {
|
||||
return AssignItem(self, from, value);
|
||||
return AssignItem(pself, from, value);
|
||||
}
|
||||
|
||||
ScopedPyObjectPtr full_slice(PySlice_New(NULL, NULL, NULL));
|
||||
if (full_slice == NULL) {
|
||||
return -1;
|
||||
}
|
||||
ScopedPyObjectPtr new_list(Subscript(self, full_slice.get()));
|
||||
ScopedPyObjectPtr new_list(Subscript(pself, full_slice.get()));
|
||||
if (new_list == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@@ -509,14 +517,17 @@ PyObject* Extend(RepeatedScalarContainer* self, PyObject* value) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject* Insert(RepeatedScalarContainer* self, PyObject* args) {
|
||||
static PyObject* Insert(PyObject* pself, PyObject* args) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
|
||||
Py_ssize_t index;
|
||||
PyObject* value;
|
||||
if (!PyArg_ParseTuple(args, "lO", &index, &value)) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr full_slice(PySlice_New(NULL, NULL, NULL));
|
||||
ScopedPyObjectPtr new_list(Subscript(self, full_slice.get()));
|
||||
ScopedPyObjectPtr new_list(Subscript(pself, full_slice.get()));
|
||||
if (PyList_Insert(new_list.get(), index, value) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -527,10 +538,10 @@ static PyObject* Insert(RepeatedScalarContainer* self, PyObject* args) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject* Remove(RepeatedScalarContainer* self, PyObject* value) {
|
||||
static PyObject* Remove(PyObject* pself, PyObject* value) {
|
||||
Py_ssize_t match_index = -1;
|
||||
for (Py_ssize_t i = 0; i < Len(self); ++i) {
|
||||
ScopedPyObjectPtr elem(Item(self, i));
|
||||
for (Py_ssize_t i = 0; i < Len(pself); ++i) {
|
||||
ScopedPyObjectPtr elem(Item(pself, i));
|
||||
if (PyObject_RichCompareBool(elem.get(), value, Py_EQ)) {
|
||||
match_index = i;
|
||||
break;
|
||||
@@ -540,15 +551,17 @@ static PyObject* Remove(RepeatedScalarContainer* self, PyObject* value) {
|
||||
PyErr_SetString(PyExc_ValueError, "remove(x): x not in container");
|
||||
return NULL;
|
||||
}
|
||||
if (AssignItem(self, match_index, NULL) < 0) {
|
||||
if (AssignItem(pself, match_index, NULL) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject* RichCompare(RepeatedScalarContainer* self,
|
||||
PyObject* other,
|
||||
int opid) {
|
||||
static PyObject* ExtendMethod(PyObject* self, PyObject* value) {
|
||||
return Extend(reinterpret_cast<RepeatedScalarContainer*>(self), value);
|
||||
}
|
||||
|
||||
static PyObject* RichCompare(PyObject* pself, PyObject* other, int opid) {
|
||||
if (opid != Py_EQ && opid != Py_NE) {
|
||||
Py_INCREF(Py_NotImplemented);
|
||||
return Py_NotImplemented;
|
||||
@@ -565,28 +578,25 @@ static PyObject* RichCompare(RepeatedScalarContainer* self,
|
||||
|
||||
ScopedPyObjectPtr other_list_deleter;
|
||||
if (PyObject_TypeCheck(other, &RepeatedScalarContainer_Type)) {
|
||||
other_list_deleter.reset(Subscript(
|
||||
reinterpret_cast<RepeatedScalarContainer*>(other), full_slice.get()));
|
||||
other_list_deleter.reset(Subscript(other, full_slice.get()));
|
||||
other = other_list_deleter.get();
|
||||
}
|
||||
|
||||
ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
|
||||
ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
|
||||
if (list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
return PyObject_RichCompare(list.get(), other, opid);
|
||||
}
|
||||
|
||||
PyObject* Reduce(RepeatedScalarContainer* unused_self) {
|
||||
PyObject* Reduce(PyObject* unused_self, PyObject* unused_other) {
|
||||
PyErr_Format(
|
||||
PickleError_class,
|
||||
"can't pickle repeated message fields, convert to list first");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static PyObject* Sort(RepeatedScalarContainer* self,
|
||||
PyObject* args,
|
||||
PyObject* kwds) {
|
||||
static PyObject* Sort(PyObject* pself, PyObject* args, PyObject* kwds) {
|
||||
// Support the old sort_function argument for backwards
|
||||
// compatibility.
|
||||
if (kwds != NULL) {
|
||||
@@ -605,7 +615,7 @@ static PyObject* Sort(RepeatedScalarContainer* self,
|
||||
if (full_slice == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
|
||||
ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
|
||||
if (list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -617,38 +627,36 @@ static PyObject* Sort(RepeatedScalarContainer* self,
|
||||
if (res == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
int ret = InternalAssignRepeatedField(self, list.get());
|
||||
int ret = InternalAssignRepeatedField(
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself), list.get());
|
||||
if (ret < 0) {
|
||||
return NULL;
|
||||
}
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject* Pop(RepeatedScalarContainer* self,
|
||||
PyObject* args) {
|
||||
static PyObject* Pop(PyObject* pself, PyObject* args) {
|
||||
Py_ssize_t index = -1;
|
||||
if (!PyArg_ParseTuple(args, "|n", &index)) {
|
||||
return NULL;
|
||||
}
|
||||
PyObject* item = Item(self, index);
|
||||
PyObject* item = Item(pself, index);
|
||||
if (item == NULL) {
|
||||
PyErr_Format(PyExc_IndexError,
|
||||
"list index (%zd) out of range",
|
||||
index);
|
||||
PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
|
||||
return NULL;
|
||||
}
|
||||
if (AssignItem(self, index, NULL) < 0) {
|
||||
if (AssignItem(pself, index, NULL) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
static PyObject* ToStr(RepeatedScalarContainer* self) {
|
||||
static PyObject* ToStr(PyObject* pself) {
|
||||
ScopedPyObjectPtr full_slice(PySlice_New(NULL, NULL, NULL));
|
||||
if (full_slice == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
|
||||
ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
|
||||
if (list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -687,7 +695,8 @@ static int InitializeAndCopyToParentContainer(
|
||||
if (full_slice == NULL) {
|
||||
return -1;
|
||||
}
|
||||
ScopedPyObjectPtr values(Subscript(from, full_slice.get()));
|
||||
ScopedPyObjectPtr values(
|
||||
Subscript(reinterpret_cast<PyObject*>(from), full_slice.get()));
|
||||
if (values == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@@ -706,7 +715,10 @@ int Release(RepeatedScalarContainer* self) {
|
||||
return InitializeAndCopyToParentContainer(self, self);
|
||||
}
|
||||
|
||||
PyObject* DeepCopy(RepeatedScalarContainer* self, PyObject* arg) {
|
||||
PyObject* DeepCopy(PyObject* pself, PyObject* arg) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
|
||||
RepeatedScalarContainer* clone = reinterpret_cast<RepeatedScalarContainer*>(
|
||||
PyType_GenericAlloc(&RepeatedScalarContainer_Type, 0));
|
||||
if (clone == NULL) {
|
||||
@@ -720,45 +732,47 @@ PyObject* DeepCopy(RepeatedScalarContainer* self, PyObject* arg) {
|
||||
return reinterpret_cast<PyObject*>(clone);
|
||||
}
|
||||
|
||||
static void Dealloc(RepeatedScalarContainer* self) {
|
||||
static void Dealloc(PyObject* pself) {
|
||||
RepeatedScalarContainer* self =
|
||||
reinterpret_cast<RepeatedScalarContainer*>(pself);
|
||||
self->owner.reset();
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
Py_TYPE(self)->tp_free(pself);
|
||||
}
|
||||
|
||||
void SetOwner(RepeatedScalarContainer* self,
|
||||
const shared_ptr<Message>& new_owner) {
|
||||
const CMessage::OwnerRef& new_owner) {
|
||||
self->owner = new_owner;
|
||||
}
|
||||
|
||||
static PySequenceMethods SqMethods = {
|
||||
(lenfunc)Len, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
0, /* sq_repeat */
|
||||
(ssizeargfunc)Item, /* sq_item */
|
||||
0, /* sq_slice */
|
||||
(ssizeobjargproc)AssignItem /* sq_ass_item */
|
||||
Len, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
0, /* sq_repeat */
|
||||
Item, /* sq_item */
|
||||
0, /* sq_slice */
|
||||
AssignItem /* sq_ass_item */
|
||||
};
|
||||
|
||||
static PyMappingMethods MpMethods = {
|
||||
(lenfunc)Len, /* mp_length */
|
||||
(binaryfunc)Subscript, /* mp_subscript */
|
||||
(objobjargproc)AssSubscript, /* mp_ass_subscript */
|
||||
Len, /* mp_length */
|
||||
Subscript, /* mp_subscript */
|
||||
AssSubscript, /* mp_ass_subscript */
|
||||
};
|
||||
|
||||
static PyMethodDef Methods[] = {
|
||||
{ "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
|
||||
{ "__deepcopy__", DeepCopy, METH_VARARGS,
|
||||
"Makes a deep copy of the class." },
|
||||
{ "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
|
||||
{ "__reduce__", Reduce, METH_NOARGS,
|
||||
"Outputs picklable representation of the repeated field." },
|
||||
{ "append", (PyCFunction)Append, METH_O,
|
||||
{ "append", AppendMethod, METH_O,
|
||||
"Appends an object to the repeated container." },
|
||||
{ "extend", (PyCFunction)Extend, METH_O,
|
||||
{ "extend", ExtendMethod, METH_O,
|
||||
"Appends objects to the repeated container." },
|
||||
{ "insert", (PyCFunction)Insert, METH_VARARGS,
|
||||
"Appends objects to the repeated container." },
|
||||
{ "pop", (PyCFunction)Pop, METH_VARARGS,
|
||||
{ "insert", Insert, METH_VARARGS,
|
||||
"Inserts an object at the specified position in the container." },
|
||||
{ "pop", Pop, METH_VARARGS,
|
||||
"Removes an object from the repeated container and returns it." },
|
||||
{ "remove", (PyCFunction)Remove, METH_O,
|
||||
{ "remove", Remove, METH_O,
|
||||
"Removes an object from the repeated container." },
|
||||
{ "sort", (PyCFunction)Sort, METH_VARARGS | METH_KEYWORDS,
|
||||
"Sorts the repeated container."},
|
||||
@@ -772,12 +786,12 @@ PyTypeObject RepeatedScalarContainer_Type = {
|
||||
FULL_MODULE_NAME ".RepeatedScalarContainer", // tp_name
|
||||
sizeof(RepeatedScalarContainer), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)repeated_scalar_container::Dealloc, // tp_dealloc
|
||||
repeated_scalar_container::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
(reprfunc)repeated_scalar_container::ToStr, // tp_repr
|
||||
repeated_scalar_container::ToStr, // tp_repr
|
||||
0, // tp_as_number
|
||||
&repeated_scalar_container::SqMethods, // tp_as_sequence
|
||||
&repeated_scalar_container::MpMethods, // tp_as_mapping
|
||||
@@ -791,7 +805,7 @@ PyTypeObject RepeatedScalarContainer_Type = {
|
||||
"A Repeated scalar container", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
(richcmpfunc)repeated_scalar_container::RichCompare, // tp_richcompare
|
||||
repeated_scalar_container::RichCompare, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
|
||||
@@ -37,27 +37,14 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
|
||||
class Message;
|
||||
|
||||
#ifdef _SHARED_PTR_H
|
||||
using std::shared_ptr;
|
||||
#else
|
||||
using internal::shared_ptr;
|
||||
#endif
|
||||
|
||||
namespace python {
|
||||
|
||||
struct CMessage;
|
||||
|
||||
typedef struct RepeatedScalarContainer {
|
||||
PyObject_HEAD;
|
||||
|
||||
@@ -65,7 +52,7 @@ typedef struct RepeatedScalarContainer {
|
||||
// proto tree. Every Python RepeatedScalarContainer holds a
|
||||
// reference to it in order to keep it alive as long as there's a
|
||||
// Python object that references any part of the tree.
|
||||
shared_ptr<Message> owner;
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// Pointer to the C++ Message that contains this container. The
|
||||
// RepeatedScalarContainer does not own this pointer.
|
||||
@@ -112,7 +99,7 @@ PyObject* Extend(RepeatedScalarContainer* self, PyObject* value);
|
||||
|
||||
// Set the owner field of self and any children of self.
|
||||
void SetOwner(RepeatedScalarContainer* self,
|
||||
const shared_ptr<Message>& new_owner);
|
||||
const CMessage::OwnerRef& new_owner);
|
||||
|
||||
} // namespace repeated_scalar_container
|
||||
} // namespace python
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
// Protocol Buffers - Google's data interchange format
|
||||
// Copyright 2008 Google Inc. All rights reserved.
|
||||
// https://developers.google.com/protocol-buffers/
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// ThreadUnsafeSharedPtr<T> is the same as shared_ptr<T> without the locking
|
||||
// overhread (and thread-safety).
|
||||
#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_THREAD_UNSAFE_SHARED_PTR_H__
|
||||
#define GOOGLE_PROTOBUF_PYTHON_CPP_THREAD_UNSAFE_SHARED_PTR_H__
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace python {
|
||||
|
||||
template <typename T>
|
||||
class ThreadUnsafeSharedPtr {
|
||||
public:
|
||||
// Takes ownership.
|
||||
explicit ThreadUnsafeSharedPtr(T* ptr)
|
||||
: ptr_(ptr), refcount_(ptr ? new RefcountT(1) : nullptr) {
|
||||
}
|
||||
|
||||
ThreadUnsafeSharedPtr(const ThreadUnsafeSharedPtr& other)
|
||||
: ThreadUnsafeSharedPtr(nullptr) {
|
||||
*this = other;
|
||||
}
|
||||
|
||||
ThreadUnsafeSharedPtr& operator=(const ThreadUnsafeSharedPtr& other) {
|
||||
if (other.refcount_ == refcount_) {
|
||||
return *this;
|
||||
}
|
||||
this->~ThreadUnsafeSharedPtr();
|
||||
ptr_ = other.ptr_;
|
||||
refcount_ = other.refcount_;
|
||||
if (refcount_) {
|
||||
++*refcount_;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
~ThreadUnsafeSharedPtr() {
|
||||
if (refcount_ == nullptr) {
|
||||
GOOGLE_DCHECK(ptr_ == nullptr);
|
||||
return;
|
||||
}
|
||||
if (--*refcount_ == 0) {
|
||||
delete refcount_;
|
||||
delete ptr_;
|
||||
}
|
||||
}
|
||||
|
||||
void reset(T* ptr = nullptr) { *this = ThreadUnsafeSharedPtr(ptr); }
|
||||
|
||||
T* get() { return ptr_; }
|
||||
const T* get() const { return ptr_; }
|
||||
|
||||
void swap(ThreadUnsafeSharedPtr& other) {
|
||||
using std::swap;
|
||||
swap(ptr_, other.ptr_);
|
||||
swap(refcount_, other.refcount_);
|
||||
}
|
||||
|
||||
private:
|
||||
typedef int RefcountT;
|
||||
T* ptr_;
|
||||
RefcountT* refcount_;
|
||||
};
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_THREAD_UNSAFE_SHARED_PTR_H__
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/source_context.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\022SourceContextProtoP\001ZAgoogle.golang.org/genproto/protobuf/source_context;source_context\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n$google/protobuf/source_context.proto\x12\x0fgoogle.protobuf\"\"\n\rSourceContext\x12\x11\n\tfile_name\x18\x01 \x01(\tB\x95\x01\n\x13\x63om.google.protobufB\x12SourceContextProtoP\x01ZAgoogle.golang.org/genproto/protobuf/source_context;source_context\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,14 +38,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -66,6 +66,5 @@ SourceContext = _reflection.GeneratedProtocolMessageType('SourceContext', (_mess
|
||||
_sym_db.RegisterMessage(SourceContext)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\022SourceContextProtoP\001ZAgoogle.golang.org/genproto/protobuf/source_context;source_context\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/struct.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\013StructProtoP\001Z1github.com/golang/protobuf/ptypes/struct;structpb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x1cgoogle/protobuf/struct.proto\x12\x0fgoogle.protobuf\"\x84\x01\n\x06Struct\x12\x33\n\x06\x66ields\x18\x01 \x03(\x0b\x32#.google.protobuf.Struct.FieldsEntry\x1a\x45\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.google.protobuf.Value:\x02\x38\x01\"\xea\x01\n\x05Value\x12\x30\n\nnull_value\x18\x01 \x01(\x0e\x32\x1a.google.protobuf.NullValueH\x00\x12\x16\n\x0cnumber_value\x18\x02 \x01(\x01H\x00\x12\x16\n\x0cstring_value\x18\x03 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x04 \x01(\x08H\x00\x12/\n\x0cstruct_value\x18\x05 \x01(\x0b\x32\x17.google.protobuf.StructH\x00\x12\x30\n\nlist_value\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.ListValueH\x00\x42\x06\n\x04kind\"3\n\tListValue\x12&\n\x06values\x18\x01 \x03(\x0b\x32\x16.google.protobuf.Value*\x1b\n\tNullValue\x12\x0e\n\nNULL_VALUE\x10\x00\x42\x81\x01\n\x13\x63om.google.protobufB\x0bStructProtoP\x01Z1github.com/golang/protobuf/ptypes/struct;structpb\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -31,11 +31,11 @@ _NULLVALUE = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NULL_VALUE', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=474,
|
||||
serialized_end=501,
|
||||
)
|
||||
@@ -59,21 +59,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -96,14 +96,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_STRUCT_FIELDSENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -127,49 +127,49 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -196,14 +196,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -274,8 +274,6 @@ ListValue = _reflection.GeneratedProtocolMessageType('ListValue', (_message.Mess
|
||||
_sym_db.RegisterMessage(ListValue)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\013StructProtoP\001Z1github.com/golang/protobuf/ptypes/struct;structpb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
_STRUCT_FIELDSENTRY.has_options = True
|
||||
_STRUCT_FIELDSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
|
||||
DESCRIPTOR._options = None
|
||||
_STRUCT_FIELDSENTRY._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -141,9 +141,11 @@ def MessageToString(message,
|
||||
as_one_line: Don't introduce newlines between fields.
|
||||
pointy_brackets: If True, use angle brackets instead of curly braces for
|
||||
nesting.
|
||||
use_index_order: If True, print fields of a proto message using the order
|
||||
defined in source code instead of the field number. By default, use the
|
||||
field number order.
|
||||
use_index_order: If True, fields of a proto message will be printed using
|
||||
the order defined in source code instead of the field number, extensions
|
||||
will be printed at the end of the message and their relative order is
|
||||
determined by the extension number. By default, use the field number
|
||||
order.
|
||||
float_format: If set, use this to specify floating point number formatting
|
||||
(per the "Format Specification Mini-Language"); otherwise, str() is used.
|
||||
use_field_number: If True, print field numbers instead of names.
|
||||
@@ -336,11 +338,12 @@ class _Printer(object):
|
||||
return
|
||||
fields = message.ListFields()
|
||||
if self.use_index_order:
|
||||
fields.sort(key=lambda x: x[0].index)
|
||||
fields.sort(
|
||||
key=lambda x: x[0].number if x[0].is_extension else x[0].index)
|
||||
for field, value in fields:
|
||||
if _IsMapEntry(field):
|
||||
for key in sorted(value):
|
||||
# This is slow for maps with submessage entires because it copies the
|
||||
# This is slow for maps with submessage entries because it copies the
|
||||
# entire tree. Unfortunately this would take significant refactoring
|
||||
# of this file to work around.
|
||||
#
|
||||
@@ -645,6 +648,30 @@ class _Parser(object):
|
||||
ParseError: In case of text parsing problems.
|
||||
"""
|
||||
message_descriptor = message.DESCRIPTOR
|
||||
if (message_descriptor.full_name == _ANY_FULL_TYPE_NAME and
|
||||
tokenizer.TryConsume('[')):
|
||||
type_url_prefix, packed_type_name = self._ConsumeAnyTypeUrl(tokenizer)
|
||||
tokenizer.Consume(']')
|
||||
tokenizer.TryConsume(':')
|
||||
if tokenizer.TryConsume('<'):
|
||||
expanded_any_end_token = '>'
|
||||
else:
|
||||
tokenizer.Consume('{')
|
||||
expanded_any_end_token = '}'
|
||||
expanded_any_sub_message = _BuildMessageFromTypeName(packed_type_name,
|
||||
self.descriptor_pool)
|
||||
if not expanded_any_sub_message:
|
||||
raise ParseError('Type %s not found in descriptor pool' %
|
||||
packed_type_name)
|
||||
while not tokenizer.TryConsume(expanded_any_end_token):
|
||||
if tokenizer.AtEnd():
|
||||
raise tokenizer.ParseErrorPreviousToken('Expected "%s".' %
|
||||
(expanded_any_end_token,))
|
||||
self._MergeField(tokenizer, expanded_any_sub_message)
|
||||
message.Pack(expanded_any_sub_message,
|
||||
type_url_prefix=type_url_prefix)
|
||||
return
|
||||
|
||||
if tokenizer.TryConsume('['):
|
||||
name = [tokenizer.ConsumeIdentifier()]
|
||||
while tokenizer.TryConsume('.'):
|
||||
@@ -725,11 +752,12 @@ class _Parser(object):
|
||||
if (field.label == descriptor.FieldDescriptor.LABEL_REPEATED and
|
||||
tokenizer.TryConsume('[')):
|
||||
# Short repeated format, e.g. "foo: [1, 2, 3]"
|
||||
while True:
|
||||
merger(tokenizer, message, field)
|
||||
if tokenizer.TryConsume(']'):
|
||||
break
|
||||
tokenizer.Consume(',')
|
||||
if not tokenizer.TryConsume(']'):
|
||||
while True:
|
||||
merger(tokenizer, message, field)
|
||||
if tokenizer.TryConsume(']'):
|
||||
break
|
||||
tokenizer.Consume(',')
|
||||
|
||||
else:
|
||||
merger(tokenizer, message, field)
|
||||
@@ -777,33 +805,7 @@ class _Parser(object):
|
||||
tokenizer.Consume('{')
|
||||
end_token = '}'
|
||||
|
||||
if (field.message_type.full_name == _ANY_FULL_TYPE_NAME and
|
||||
tokenizer.TryConsume('[')):
|
||||
type_url_prefix, packed_type_name = self._ConsumeAnyTypeUrl(tokenizer)
|
||||
tokenizer.Consume(']')
|
||||
tokenizer.TryConsume(':')
|
||||
if tokenizer.TryConsume('<'):
|
||||
expanded_any_end_token = '>'
|
||||
else:
|
||||
tokenizer.Consume('{')
|
||||
expanded_any_end_token = '}'
|
||||
expanded_any_sub_message = _BuildMessageFromTypeName(packed_type_name,
|
||||
self.descriptor_pool)
|
||||
if not expanded_any_sub_message:
|
||||
raise ParseError('Type %s not found in descriptor pool' %
|
||||
packed_type_name)
|
||||
while not tokenizer.TryConsume(expanded_any_end_token):
|
||||
if tokenizer.AtEnd():
|
||||
raise tokenizer.ParseErrorPreviousToken('Expected "%s".' %
|
||||
(expanded_any_end_token,))
|
||||
self._MergeField(tokenizer, expanded_any_sub_message)
|
||||
if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
any_message = getattr(message, field.name).add()
|
||||
else:
|
||||
any_message = getattr(message, field.name)
|
||||
any_message.Pack(expanded_any_sub_message,
|
||||
type_url_prefix=type_url_prefix)
|
||||
elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
if field.is_extension:
|
||||
sub_message = message.Extensions[field].add()
|
||||
elif is_map_entry:
|
||||
@@ -812,8 +814,20 @@ class _Parser(object):
|
||||
sub_message = getattr(message, field.name).add()
|
||||
else:
|
||||
if field.is_extension:
|
||||
if (not self._allow_multiple_scalars and
|
||||
message.HasExtension(field)):
|
||||
raise tokenizer.ParseErrorPreviousToken(
|
||||
'Message type "%s" should not have multiple "%s" extensions.' %
|
||||
(message.DESCRIPTOR.full_name, field.full_name))
|
||||
sub_message = message.Extensions[field]
|
||||
else:
|
||||
# Also apply _allow_multiple_scalars to message field.
|
||||
# TODO(jieluo): Change to _allow_singular_overwrites.
|
||||
if (not self._allow_multiple_scalars and
|
||||
message.HasField(field.name)):
|
||||
raise tokenizer.ParseErrorPreviousToken(
|
||||
'Message type "%s" should not have multiple "%s" fields.' %
|
||||
(message.DESCRIPTOR.full_name, field.name))
|
||||
sub_message = getattr(message, field.name)
|
||||
sub_message.SetInParent()
|
||||
|
||||
@@ -938,7 +952,7 @@ def _SkipField(tokenizer):
|
||||
tokenizer.ConsumeIdentifier()
|
||||
tokenizer.Consume(']')
|
||||
else:
|
||||
tokenizer.ConsumeIdentifier()
|
||||
tokenizer.ConsumeIdentifierOrNumber()
|
||||
|
||||
_SkipFieldContents(tokenizer)
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/timestamp.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\016TimestampProtoP\001Z+github.com/golang/protobuf/ptypes/timestamp\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x1fgoogle/protobuf/timestamp.proto\x12\x0fgoogle.protobuf\"+\n\tTimestamp\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\x42~\n\x13\x63om.google.protobufB\x0eTimestampProtoP\x01Z+github.com/golang/protobuf/ptypes/timestamp\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,21 +38,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -73,6 +73,5 @@ Timestamp = _reflection.GeneratedProtocolMessageType('Timestamp', (_message.Mess
|
||||
_sym_db.RegisterMessage(Timestamp)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\016TimestampProtoP\001Z+github.com/golang/protobuf/ptypes/timestamp\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -22,6 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/type.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\tTypeProtoP\001Z/google.golang.org/genproto/protobuf/ptype;ptype\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x1agoogle/protobuf/type.proto\x12\x0fgoogle.protobuf\x1a\x19google/protobuf/any.proto\x1a$google/protobuf/source_context.proto\"\xd7\x01\n\x04Type\x12\x0c\n\x04name\x18\x01 \x01(\t\x12&\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x16.google.protobuf.Field\x12\x0e\n\x06oneofs\x18\x03 \x03(\t\x12(\n\x07options\x18\x04 \x03(\x0b\x32\x17.google.protobuf.Option\x12\x36\n\x0esource_context\x18\x05 \x01(\x0b\x32\x1e.google.protobuf.SourceContext\x12\'\n\x06syntax\x18\x06 \x01(\x0e\x32\x17.google.protobuf.Syntax\"\xd5\x05\n\x05\x46ield\x12)\n\x04kind\x18\x01 \x01(\x0e\x32\x1b.google.protobuf.Field.Kind\x12\x37\n\x0b\x63\x61rdinality\x18\x02 \x01(\x0e\x32\".google.protobuf.Field.Cardinality\x12\x0e\n\x06number\x18\x03 \x01(\x05\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x10\n\x08type_url\x18\x06 \x01(\t\x12\x13\n\x0boneof_index\x18\x07 \x01(\x05\x12\x0e\n\x06packed\x18\x08 \x01(\x08\x12(\n\x07options\x18\t \x03(\x0b\x32\x17.google.protobuf.Option\x12\x11\n\tjson_name\x18\n \x01(\t\x12\x15\n\rdefault_value\x18\x0b \x01(\t\"\xc8\x02\n\x04Kind\x12\x10\n\x0cTYPE_UNKNOWN\x10\x00\x12\x0f\n\x0bTYPE_DOUBLE\x10\x01\x12\x0e\n\nTYPE_FLOAT\x10\x02\x12\x0e\n\nTYPE_INT64\x10\x03\x12\x0f\n\x0bTYPE_UINT64\x10\x04\x12\x0e\n\nTYPE_INT32\x10\x05\x12\x10\n\x0cTYPE_FIXED64\x10\x06\x12\x10\n\x0cTYPE_FIXED32\x10\x07\x12\r\n\tTYPE_BOOL\x10\x08\x12\x0f\n\x0bTYPE_STRING\x10\t\x12\x0e\n\nTYPE_GROUP\x10\n\x12\x10\n\x0cTYPE_MESSAGE\x10\x0b\x12\x0e\n\nTYPE_BYTES\x10\x0c\x12\x0f\n\x0bTYPE_UINT32\x10\r\x12\r\n\tTYPE_ENUM\x10\x0e\x12\x11\n\rTYPE_SFIXED32\x10\x0f\x12\x11\n\rTYPE_SFIXED64\x10\x10\x12\x0f\n\x0bTYPE_SINT32\x10\x11\x12\x0f\n\x0bTYPE_SINT64\x10\x12\"t\n\x0b\x43\x61rdinality\x12\x17\n\x13\x43\x41RDINALITY_UNKNOWN\x10\x00\x12\x18\n\x14\x43\x41RDINALITY_OPTIONAL\x10\x01\x12\x18\n\x14\x43\x41RDINALITY_REQUIRED\x10\x02\x12\x18\n\x14\x43\x41RDINALITY_REPEATED\x10\x03\"\xce\x01\n\x04\x45num\x12\x0c\n\x04name\x18\x01 \x01(\t\x12-\n\tenumvalue\x18\x02 \x03(\x0b\x32\x1a.google.protobuf.EnumValue\x12(\n\x07options\x18\x03 \x03(\x0b\x32\x17.google.protobuf.Option\x12\x36\n\x0esource_context\x18\x04 \x01(\x0b\x32\x1e.google.protobuf.SourceContext\x12\'\n\x06syntax\x18\x05 \x01(\x0e\x32\x17.google.protobuf.Syntax\"S\n\tEnumValue\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06number\x18\x02 \x01(\x05\x12(\n\x07options\x18\x03 \x03(\x0b\x32\x17.google.protobuf.Option\";\n\x06Option\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any*.\n\x06Syntax\x12\x11\n\rSYNTAX_PROTO2\x10\x00\x12\x11\n\rSYNTAX_PROTO3\x10\x01\x42}\n\x13\x63om.google.protobufB\tTypeProtoP\x01Z/google.golang.org/genproto/protobuf/ptype;ptype\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_source__context__pb2.DESCRIPTOR,])
|
||||
@@ -34,15 +34,15 @@ _SYNTAX = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='SYNTAX_PROTO2', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='SYNTAX_PROTO3', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1413,
|
||||
serialized_end=1459,
|
||||
)
|
||||
@@ -61,83 +61,83 @@ _FIELD_KIND = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_UNKNOWN', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_DOUBLE', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_FLOAT', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_INT64', index=3, number=3,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_UINT64', index=4, number=4,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_INT32', index=5, number=5,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_FIXED64', index=6, number=6,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_FIXED32', index=7, number=7,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_BOOL', index=8, number=8,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_STRING', index=9, number=9,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_GROUP', index=10, number=10,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_MESSAGE', index=11, number=11,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_BYTES', index=12, number=12,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_UINT32', index=13, number=13,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_ENUM', index=14, number=14,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_SFIXED32', index=15, number=15,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_SFIXED64', index=16, number=16,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_SINT32', index=17, number=17,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TYPE_SINT64', index=18, number=18,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=610,
|
||||
serialized_end=938,
|
||||
)
|
||||
@@ -151,23 +151,23 @@ _FIELD_CARDINALITY = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='CARDINALITY_UNKNOWN', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='CARDINALITY_OPTIONAL', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='CARDINALITY_REQUIRED', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='CARDINALITY_REPEATED', index=3, number=3,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=940,
|
||||
serialized_end=1056,
|
||||
)
|
||||
@@ -187,49 +187,49 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -325,7 +325,7 @@ _FIELD = _descriptor.Descriptor(
|
||||
_FIELD_KIND,
|
||||
_FIELD_CARDINALITY,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -349,42 +349,42 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -408,28 +408,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -453,21 +453,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -536,6 +536,5 @@ Option = _reflection.GeneratedProtocolMessageType('Option', (_message.Message,),
|
||||
_sym_db.RegisterMessage(Option)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\tTypeProtoP\001Z/google.golang.org/genproto/protobuf/ptype;ptype\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_arena.proto',
|
||||
package='proto2_arena_unittest',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('\370\001\001'),
|
||||
serialized_pb=_b('\n$google/protobuf/unittest_arena.proto\x12\x15proto2_arena_unittest\x1a.google/protobuf/unittest_no_arena_import.proto\"\x1a\n\rNestedMessage\x12\t\n\x01\x64\x18\x01 \x01(\x05\"\xb2\x01\n\x0c\x41renaMessage\x12\x45\n\x17repeated_nested_message\x18\x01 \x03(\x0b\x32$.proto2_arena_unittest.NestedMessage\x12[\n repeated_import_no_arena_message\x18\x02 \x03(\x0b\x32\x31.proto2_arena_unittest.ImportNoArenaNestedMessageB\x03\xf8\x01\x01')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_unittest__no__arena__import__pb2.DESCRIPTOR,])
|
||||
@@ -40,14 +40,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -71,21 +71,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -116,6 +116,5 @@ ArenaMessage = _reflection.GeneratedProtocolMessageType('ArenaMessage', (_messag
|
||||
_sym_db.RegisterMessage(ArenaMessage)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\370\001\001'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
File diff suppressed because it is too large.
Load diff
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -22,6 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_import.proto',
|
||||
package='protobuf_unittest_import',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('\n\030com.google.protobuf.testH\001\370\001\001'),
|
||||
serialized_pb=_b('\n%google/protobuf/unittest_import.proto\x12\x18protobuf_unittest_import\x1a,google/protobuf/unittest_import_public.proto\"\x1a\n\rImportMessage\x12\t\n\x01\x64\x18\x01 \x01(\x05*<\n\nImportEnum\x12\x0e\n\nIMPORT_FOO\x10\x07\x12\x0e\n\nIMPORT_BAR\x10\x08\x12\x0e\n\nIMPORT_BAZ\x10\t*1\n\x10ImportEnumForMap\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x46OO\x10\x01\x12\x07\n\x03\x42\x41R\x10\x02\x42\x1f\n\x18\x63om.google.protobuf.testH\x01\xf8\x01\x01P\x00')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_unittest__import__public__pb2.DESCRIPTOR,],
|
||||
@@ -35,19 +35,19 @@ _IMPORTENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='IMPORT_FOO', index=0, number=7,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='IMPORT_BAR', index=1, number=8,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='IMPORT_BAZ', index=2, number=9,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=141,
|
||||
serialized_end=201,
|
||||
)
|
||||
@@ -62,19 +62,19 @@ _IMPORTENUMFORMAP = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='UNKNOWN', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOO', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAR', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=203,
|
||||
serialized_end=252,
|
||||
)
|
||||
@@ -103,14 +103,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -133,6 +133,5 @@ ImportMessage = _reflection.GeneratedProtocolMessageType('ImportMessage', (_mess
|
||||
_sym_db.RegisterMessage(ImportMessage)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\030com.google.protobuf.testH\001\370\001\001'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_import_public.proto',
|
||||
package='protobuf_unittest_import',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('\n\030com.google.protobuf.test'),
|
||||
serialized_pb=_b('\n,google/protobuf/unittest_import_public.proto\x12\x18protobuf_unittest_import\" \n\x13PublicImportMessage\x12\t\n\x01\x65\x18\x01 \x01(\x05\x42\x1a\n\x18\x63om.google.protobuf.test')
|
||||
)
|
||||
|
||||
@@ -38,14 +38,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -66,6 +66,5 @@ PublicImportMessage = _reflection.GeneratedProtocolMessageType('PublicImportMess
|
||||
_sym_db.RegisterMessage(PublicImportMessage)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\030com.google.protobuf.test'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_mset.proto',
|
||||
package='protobuf_unittest',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('H\001\370\001\001'),
|
||||
serialized_pb=_b('\n#google/protobuf/unittest_mset.proto\x12\x11protobuf_unittest\x1a/google/protobuf/unittest_mset_wire_format.proto\"Z\n\x17TestMessageSetContainer\x12?\n\x0bmessage_set\x18\x01 \x01(\x0b\x32*.proto2_wireformat_unittest.TestMessageSet\"\x9f\x01\n\x18TestMessageSetExtension1\x12\t\n\x01i\x18\x0f \x01(\x05\x32x\n\x15message_set_extension\x12*.proto2_wireformat_unittest.TestMessageSet\x18\xb0\xa6^ \x01(\x0b\x32+.protobuf_unittest.TestMessageSetExtension1\"\xa1\x01\n\x18TestMessageSetExtension2\x12\x0b\n\x03str\x18\x19 \x01(\t2x\n\x15message_set_extension\x12*.proto2_wireformat_unittest.TestMessageSet\x18\xf9\xbb^ \x01(\x0b\x32+.protobuf_unittest.TestMessageSetExtension2\"n\n\rRawMessageSet\x12\x33\n\x04item\x18\x01 \x03(\n2%.protobuf_unittest.RawMessageSet.Item\x1a(\n\x04Item\x12\x0f\n\x07type_id\x18\x02 \x02(\x05\x12\x0f\n\x07message\x18\x03 \x02(\x0c\x42\x05H\x01\xf8\x01\x01')
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_unittest__mset__wire__format__pb2.DESCRIPTOR,])
|
||||
@@ -40,14 +40,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -80,12 +80,12 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
@@ -118,12 +118,12 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -147,21 +147,21 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -184,14 +184,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_RAWMESSAGESET_ITEM, ],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -251,6 +251,5 @@ google_dot_protobuf_dot_unittest__mset__wire__format__pb2.TestMessageSet.Registe
|
||||
_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'].message_type = _TESTMESSAGESETEXTENSION2
|
||||
google_dot_protobuf_dot_unittest__mset__wire__format__pb2.TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'])
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\001\370\001\001'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_mset_wire_format.proto',
|
||||
package='proto2_wireformat_unittest',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('H\001\370\001\001\252\002!Google.ProtocolBuffers.TestProtos'),
|
||||
serialized_pb=_b('\n/google/protobuf/unittest_mset_wire_format.proto\x12\x1aproto2_wireformat_unittest\"\x1e\n\x0eTestMessageSet*\x08\x08\x04\x10\xff\xff\xff\xff\x07:\x02\x08\x01\"d\n!TestMessageSetWireFormatContainer\x12?\n\x0bmessage_set\x18\x01 \x01(\x0b\x32*.proto2_wireformat_unittest.TestMessageSetB)H\x01\xf8\x01\x01\xaa\x02!Google.ProtocolBuffers.TestProtos')
|
||||
)
|
||||
|
||||
@@ -38,7 +38,7 @@ _TESTMESSAGESET = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\010\001')),
|
||||
serialized_options=_b('\010\001'),
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(4, 2147483647), ],
|
||||
@@ -62,14 +62,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -99,8 +99,6 @@ TestMessageSetWireFormatContainer = _reflection.GeneratedProtocolMessageType('Te
|
||||
_sym_db.RegisterMessage(TestMessageSetWireFormatContainer)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\001\370\001\001\252\002!Google.ProtocolBuffers.TestProtos'))
|
||||
_TESTMESSAGESET.has_options = True
|
||||
_TESTMESSAGESET._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('\010\001'))
|
||||
DESCRIPTOR._options = None
|
||||
_TESTMESSAGESET._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_no_arena_import.proto',
|
||||
package='proto2_arena_unittest',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n.google/protobuf/unittest_no_arena_import.proto\x12\x15proto2_arena_unittest\"\'\n\x1aImportNoArenaNestedMessage\x12\t\n\x01\x64\x18\x01 \x01(\x05')
|
||||
)
|
||||
|
||||
@@ -38,14 +38,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -26,6 +25,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_no_arena.proto',
|
||||
package='protobuf_unittest_no_arena',
|
||||
syntax='proto2',
|
||||
serialized_options=_b('B\rUnittestProtoH\001\200\001\001\210\001\001\220\001\001\370\001\000\242\002\005NOARN'),
|
||||
serialized_pb=_b('\n\'google/protobuf/unittest_no_arena.proto\x12\x1aprotobuf_unittest_no_arena\x1a%google/protobuf/unittest_import.proto\x1a$google/protobuf/unittest_arena.proto\"\xd0\x1a\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\x12M\n\roptionalgroup\x18\x10 \x01(\n26.protobuf_unittest_no_arena.TestAllTypes.OptionalGroup\x12W\n\x17optional_nested_message\x18\x12 \x01(\x0b\x32\x36.protobuf_unittest_no_arena.TestAllTypes.NestedMessage\x12L\n\x18optional_foreign_message\x18\x13 \x01(\x0b\x32*.protobuf_unittest_no_arena.ForeignMessage\x12H\n\x17optional_import_message\x18\x14 \x01(\x0b\x32\'.protobuf_unittest_import.ImportMessage\x12Q\n\x14optional_nested_enum\x18\x15 \x01(\x0e\x32\x33.protobuf_unittest_no_arena.TestAllTypes.NestedEnum\x12\x46\n\x15optional_foreign_enum\x18\x16 \x01(\x0e\x32\'.protobuf_unittest_no_arena.ForeignEnum\x12\x42\n\x14optional_import_enum\x18\x17 \x01(\x0e\x32$.protobuf_unittest_import.ImportEnum\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\x10optional_message\x18\x1b \x01(\x0b\x32\x36.protobuf_unittest_no_arena.TestAllTypes.NestedMessageB\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\x12M\n\rrepeatedgroup\x18. \x03(\n26.protobuf_unittest_no_arena.TestAllTypes.RepeatedGroup\x12W\n\x17repeated_nested_message\x18\x30 \x03(\x0b\x32\x36.protobuf_unittest_no_arena.TestAllTypes.NestedMessage\x12L\n\x18repeated_foreign_message\x18\x31 \x03(\x0b\x32*.protobuf_unittest_no_arena.ForeignMessage\x12H\n\x17repeated_import_message\x18\x32 \x03(\x0b\x32\'.protobuf_unittest_import.ImportMessage\x12Q\n\x14repeated_nested_enum\x18\x33 \x03(\x0e\x32\x33.protobuf_unittest_no_arena.TestAllTypes.NestedEnum\x12\x46\n\x15repeated_foreign_enum\x18\x34 \x03(\x0e\x32\'.protobuf_unittest_no_arena.ForeignEnum\x12\x42\n\x14repeated_import_enum\x18\x35 \x03(\x0e\x32$.protobuf_unittest_import.ImportEnum\x12!\n\x15repeated_string_piece\x18\x36 \x03(\tB\x02\x08\x02\x12\x19\n\rrepeated_cord\x18\x37 \x03(\tB\x02\x08\x01\x12Y\n\x15repeated_lazy_message\x18\x39 \x03(\x0b\x32\x36.protobuf_unittest_no_arena.TestAllTypes.NestedMessageB\x02(\x01\x12\x19\n\rdefault_int32\x18= \x01(\x05:\x02\x34\x31\x12\x19\n\rdefault_int64\x18> \x01(\x03:\x02\x34\x32\x12\x1a\n\x0e\x64\x65\x66\x61ult_uint32\x18? \x01(\r:\x02\x34\x33\x12\x1a\n\x0e\x64\x65\x66\x61ult_uint64\x18@ \x01(\x04:\x02\x34\x34\x12\x1b\n\x0e\x64\x65\x66\x61ult_sint32\x18\x41 \x01(\x11:\x03-45\x12\x1a\n\x0e\x64\x65\x66\x61ult_sint64\x18\x42 \x01(\x12:\x02\x34\x36\x12\x1b\n\x0f\x64\x65\x66\x61ult_fixed32\x18\x43 \x01(\x07:\x02\x34\x37\x12\x1b\n\x0f\x64\x65\x66\x61ult_fixed64\x18\x44 \x01(\x06:\x02\x34\x38\x12\x1c\n\x10\x64\x65\x66\x61ult_sfixed32\x18\x45 \x01(\x0f:\x02\x34\x39\x12\x1d\n\x10\x64\x65\x66\x61ult_sfixed64\x18\x46 \x01(\x10:\x03-50\x12\x1b\n\rdefault_float\x18G \x01(\x02:\x04\x35\x31.5\x12\x1d\n\x0e\x64\x65\x66\x61ult_double\x18H \x01(\x01:\x05\x35\x32\x30\x30\x30\x12\x1a\n\x0c\x64\x65\x66\x61ult_bool\x18I \x01(\x08:\x04true\x12\x1d\n\x0e\x64\x65\x66\x61ult_string\x18J \x01(\t:\x05hello\x12\x1c\n\rdefault_bytes\x18K \x01(\x0c:\x05world\x12U\n\x13\x64\x65\x66\x61ult_nested_enum\x18Q \x01(\x0e\x32\x33.protobuf_unittest_no_arena.TestAllTypes.NestedEnum:\x03\x42\x41R\x12R\n\x14\x64\x65\x66\x61ult_foreign_enum\x18R \x01(\x0e\x32\'.protobuf_unittest_no_arena.ForeignEnum:\x0b\x46OREIGN_BAR\x12M\n\x13\x64\x65\x66\x61ult_import_enum\x18S \x01(\x0e\x32$.protobuf_unittest_import.ImportEnum:\nIMPORT_BAR\x12%\n\x14\x64\x65\x66\x61ult_string_piece\x18T \x01(\t:\x03\x61\x62\x63\x42\x02\x08\x02\x12\x1d\n\x0c\x64\x65\x66\x61ulLine truncated
|
||||
,
|
||||
dependencies=[google_dot_protobuf_dot_unittest__import__pb2.DESCRIPTOR,google_dot_protobuf_dot_unittest__arena__pb2.DESCRIPTOR,])
|
||||
@@ -38,19 +38,19 @@ _FOREIGNENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_FOO', index=0, number=4,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_BAR', index=1, number=5,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_BAZ', index=2, number=6,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=3670,
|
||||
serialized_end=3734,
|
||||
)
|
||||
@@ -70,23 +70,23 @@ _TESTALLTYPES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOO', index=0, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAR', index=1, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAZ', index=2, number=3,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NEG', index=3, number=-1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=3485,
|
||||
serialized_end=3542,
|
||||
)
|
||||
@@ -106,14 +106,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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -136,14 +136,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -166,14 +166,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_b('(\001'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -729,7 +729,7 @@ _TESTALLTYPES = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_TESTALLTYPES_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -756,14 +756,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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -787,14 +787,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
@@ -898,24 +898,14 @@ TestNoArenaMessage = _reflection.GeneratedProtocolMessageType('TestNoArenaMessag
|
||||
_sym_db.RegisterMessage(TestNoArenaMessage)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('B\rUnittestProtoH\001\200\001\001\210\001\001\220\001\001\370\001\000\242\002\005NOARN'))
|
||||
_TESTALLTYPES.fields_by_name['optional_string_piece'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_string_piece']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))
|
||||
_TESTALLTYPES.fields_by_name['optional_cord'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_cord']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))
|
||||
_TESTALLTYPES.fields_by_name['optional_message'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_message']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))
|
||||
_TESTALLTYPES.fields_by_name['repeated_string_piece'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['repeated_string_piece']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))
|
||||
_TESTALLTYPES.fields_by_name['repeated_cord'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['repeated_cord']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))
|
||||
_TESTALLTYPES.fields_by_name['repeated_lazy_message'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['repeated_lazy_message']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))
|
||||
_TESTALLTYPES.fields_by_name['default_string_piece'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['default_string_piece']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))
|
||||
_TESTALLTYPES.fields_by_name['default_cord'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['default_cord']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))
|
||||
_TESTALLTYPES.fields_by_name['lazy_oneof_nested_message'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['lazy_oneof_nested_message']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))
|
||||
DESCRIPTOR._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_string_piece']._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_cord']._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_message']._options = None
|
||||
_TESTALLTYPES.fields_by_name['repeated_string_piece']._options = None
|
||||
_TESTALLTYPES.fields_by_name['repeated_cord']._options = None
|
||||
_TESTALLTYPES.fields_by_name['repeated_lazy_message']._options = None
|
||||
_TESTALLTYPES.fields_by_name['default_string_piece']._options = None
|
||||
_TESTALLTYPES.fields_by_name['default_cord']._options = None
|
||||
_TESTALLTYPES.fields_by_name['lazy_oneof_nested_message']._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_no_generic_services.proto',
|
||||
package='google.protobuf.no_generic_services_test',
|
||||
syntax='proto2',
|
||||
serialized_options=None,
|
||||
serialized_pb=_b('\n2google/protobuf/unittest_no_generic_services.proto\x12(google.protobuf.no_generic_services_test\"#\n\x0bTestMessage\x12\t\n\x01\x61\x18\x01 \x01(\x05*\t\x08\xe8\x07\x10\x80\x80\x80\x80\x02*\x13\n\x08TestEnum\x12\x07\n\x03\x46OO\x10\x01\x32\x82\x01\n\x0bTestService\x12s\n\x03\x46oo\x12\x35.google.protobuf.no_generic_services_test.TestMessage\x1a\x35.google.protobuf.no_generic_services_test.TestMessage:N\n\x0etest_extension\x12\x35.google.protobuf.no_generic_services_test.TestMessage\x18\xe8\x07 \x01(\x05')
|
||||
)
|
||||
|
||||
@@ -31,11 +31,11 @@ _TESTENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOO', index=0, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=133,
|
||||
serialized_end=152,
|
||||
)
|
||||
@@ -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, file=DESCRIPTOR)
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
|
||||
|
||||
_TESTMESSAGE = _descriptor.Descriptor(
|
||||
@@ -67,14 +67,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1000, 536870912), ],
|
||||
@@ -104,7 +104,7 @@ _TESTSERVICE = _descriptor.ServiceDescriptor(
|
||||
full_name='google.protobuf.no_generic_services_test.TestService',
|
||||
file=DESCRIPTOR,
|
||||
index=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=155,
|
||||
serialized_end=285,
|
||||
methods=[
|
||||
@@ -115,7 +115,7 @@ _TESTSERVICE = _descriptor.ServiceDescriptor(
|
||||
containing_service=None,
|
||||
input_type=_TESTMESSAGE,
|
||||
output_type=_TESTMESSAGE,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
),
|
||||
])
|
||||
_sym_db.RegisterServiceDescriptor(_TESTSERVICE)
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -25,6 +24,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/unittest_proto3_arena.proto',
|
||||
package='proto3_arena_unittest',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\370\001\001'),
|
||||
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,])
|
||||
@@ -37,23 +37,23 @@ _FOREIGNENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_ZERO', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_FOO', index=1, number=4,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_BAR', index=2, number=5,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOREIGN_BAZ', index=3, number=6,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=3527,
|
||||
serialized_end=3609,
|
||||
)
|
||||
@@ -74,27 +74,27 @@ _TESTALLTYPES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ZERO', index=0, number=0,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOO', index=1, number=1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAR', index=2, number=2,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAZ', index=3, number=3,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NEG', index=4, number=-1,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
serialized_start=2277,
|
||||
serialized_end=2344,
|
||||
)
|
||||
@@ -114,14 +114,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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
@@ -509,7 +509,7 @@ _TESTALLTYPES = _descriptor.Descriptor(
|
||||
enum_types=[
|
||||
_TESTALLTYPES_NESTEDENUM,
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -536,105 +536,105 @@ _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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_b('\020\001'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -658,105 +658,105 @@ _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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_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')), file=DESCRIPTOR),
|
||||
serialized_options=_b('\020\000'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -780,28 +780,28 @@ _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, file=DESCRIPTOR),
|
||||
serialized_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, file=DESCRIPTOR),
|
||||
serialized_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),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -825,14 +825,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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -856,7 +856,7 @@ _TESTEMPTYMESSAGE = _descriptor.Descriptor(
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -960,76 +960,40 @@ TestEmptyMessage = _reflection.GeneratedProtocolMessageType('TestEmptyMessage',
|
||||
_sym_db.RegisterMessage(TestEmptyMessage)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\370\001\001'))
|
||||
_TESTALLTYPES.fields_by_name['optional_string_piece'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_string_piece']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))
|
||||
_TESTALLTYPES.fields_by_name['optional_cord'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_cord']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))
|
||||
_TESTALLTYPES.fields_by_name['optional_lazy_message'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_lazy_message']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))
|
||||
_TESTALLTYPES.fields_by_name['optional_lazy_import_message'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['optional_lazy_import_message']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))
|
||||
_TESTALLTYPES.fields_by_name['repeated_string_piece'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['repeated_string_piece']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\002'))
|
||||
_TESTALLTYPES.fields_by_name['repeated_cord'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['repeated_cord']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\010\001'))
|
||||
_TESTALLTYPES.fields_by_name['repeated_lazy_message'].has_options = True
|
||||
_TESTALLTYPES.fields_by_name['repeated_lazy_message']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('(\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_int32'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_int32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_int64'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_int64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_uint32'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_uint32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_uint64'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_uint64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sint32'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sint32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sint64'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sint64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_fixed32'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_fixed32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_fixed64'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_fixed64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sfixed32'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sfixed32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sfixed64'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sfixed64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_float'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_float']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_double'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_double']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_bool'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_bool']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_enum'].has_options = True
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_enum']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum'].has_options = True
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\000'))
|
||||
DESCRIPTOR._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_string_piece']._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_cord']._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_lazy_message']._options = None
|
||||
_TESTALLTYPES.fields_by_name['optional_lazy_import_message']._options = None
|
||||
_TESTALLTYPES.fields_by_name['repeated_string_piece']._options = None
|
||||
_TESTALLTYPES.fields_by_name['repeated_cord']._options = None
|
||||
_TESTALLTYPES.fields_by_name['repeated_lazy_message']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_int32']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_int64']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_uint32']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_uint64']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sint32']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sint64']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_fixed32']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_fixed64']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sfixed32']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_sfixed64']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_float']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_double']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_bool']._options = None
|
||||
_TESTPACKEDTYPES.fields_by_name['packed_enum']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum']._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
File diff suppressed because it is too large.
Load diff
@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
from google.protobuf import descriptor_pb2
|
||||
# @@protoc_insertion_point(imports)
|
||||
|
||||
_sym_db = _symbol_database.Default()
|
||||
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='google/protobuf/wrappers.proto',
|
||||
package='google.protobuf',
|
||||
syntax='proto3',
|
||||
serialized_options=_b('\n\023com.google.protobufB\rWrappersProtoP\001Z*github.com/golang/protobuf/ptypes/wrappers\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'),
|
||||
serialized_pb=_b('\n\x1egoogle/protobuf/wrappers.proto\x12\x0fgoogle.protobuf\"\x1c\n\x0b\x44oubleValue\x12\r\n\x05value\x18\x01 \x01(\x01\"\x1b\n\nFloatValue\x12\r\n\x05value\x18\x01 \x01(\x02\"\x1b\n\nInt64Value\x12\r\n\x05value\x18\x01 \x01(\x03\"\x1c\n\x0bUInt64Value\x12\r\n\x05value\x18\x01 \x01(\x04\"\x1b\n\nInt32Value\x12\r\n\x05value\x18\x01 \x01(\x05\"\x1c\n\x0bUInt32Value\x12\r\n\x05value\x18\x01 \x01(\r\"\x1a\n\tBoolValue\x12\r\n\x05value\x18\x01 \x01(\x08\"\x1c\n\x0bStringValue\x12\r\n\x05value\x18\x01 \x01(\t\"\x1b\n\nBytesValue\x12\r\n\x05value\x18\x01 \x01(\x0c\x42|\n\x13\x63om.google.protobufB\rWrappersProtoP\x01Z*github.com/golang/protobuf/ptypes/wrappers\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
)
|
||||
|
||||
@@ -38,14 +38,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -69,14 +69,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -100,14 +100,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -131,14 +131,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -162,14 +162,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -193,14 +193,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -224,14 +224,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -255,14 +255,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -286,14 +286,14 @@ _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, file=DESCRIPTOR),
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
@@ -378,6 +378,5 @@ BytesValue = _reflection.GeneratedProtocolMessageType('BytesValue', (_message.Me
|
||||
_sym_db.RegisterMessage(BytesValue)
|
||||
|
||||
|
||||
DESCRIPTOR.has_options = True
|
||||
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\023com.google.protobufB\rWrappersProtoP\001Z*github.com/golang/protobuf/ptypes/wrappers\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'))
|
||||
DESCRIPTOR._options = None
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Reference in new issue
Block a user