Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
Executable → Regular
File mode changed.
Executable → Regular
+1
-7
@@ -30,10 +30,4 @@
|
||||
|
||||
# Copyright 2007 Google Inc. All Rights Reserved.
|
||||
|
||||
__version__ = '3.6.0'
|
||||
|
||||
if __name__ != '__main__':
|
||||
try:
|
||||
__import__('pkg_resources').declare_namespace(__name__)
|
||||
except ImportError:
|
||||
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
|
||||
__version__ = '3.19.1'
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/any.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,64 +14,22 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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\x42v\n\x13\x63om.google.protobufB\x08\x41nyProtoP\x01Z,google.golang.org/protobuf/types/known/anypb\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
|
||||
|
||||
|
||||
|
||||
_ANY = _descriptor.Descriptor(
|
||||
name='Any',
|
||||
full_name='google.protobuf.Any',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='type_url', full_name='google.protobuf.Any.type_url', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=46,
|
||||
serialized_end=84,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['Any'] = _ANY
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Any = _reflection.GeneratedProtocolMessageType('Any', (_message.Message,), dict(
|
||||
DESCRIPTOR = _ANY,
|
||||
__module__ = 'google.protobuf.any_pb2'
|
||||
_ANY = DESCRIPTOR.message_types_by_name['Any']
|
||||
Any = _reflection.GeneratedProtocolMessageType('Any', (_message.Message,), {
|
||||
'DESCRIPTOR' : _ANY,
|
||||
'__module__' : 'google.protobuf.any_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.Any)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Any)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\010AnyProtoP\001Z,google.golang.org/protobuf/types/known/anypb\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'
|
||||
_ANY._serialized_start=46
|
||||
_ANY._serialized_end=84
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/any_test.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,73 +15,22 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1egoogle/protobuf/any_test.proto\x12\x11protobuf_unittest\x1a\x19google/protobuf/any.proto\"\x87\x01\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.Any\x12\x0c\n\x04text\x18\x04 \x01(\tB\x0e\x42\x0cTestAnyProtob\x06proto3')
|
||||
|
||||
|
||||
|
||||
|
||||
_TESTANY = _descriptor.Descriptor(
|
||||
name='TestAny',
|
||||
full_name='protobuf_unittest.TestAny',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='int32_value', full_name='protobuf_unittest.TestAny.int32_value', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=80,
|
||||
serialized_end=201,
|
||||
)
|
||||
|
||||
_TESTANY.fields_by_name['any_value'].message_type = google_dot_protobuf_dot_any__pb2._ANY
|
||||
_TESTANY.fields_by_name['repeated_any_value'].message_type = google_dot_protobuf_dot_any__pb2._ANY
|
||||
DESCRIPTOR.message_types_by_name['TestAny'] = _TESTANY
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestAny = _reflection.GeneratedProtocolMessageType('TestAny', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTANY,
|
||||
__module__ = 'google.protobuf.any_test_pb2'
|
||||
_TESTANY = DESCRIPTOR.message_types_by_name['TestAny']
|
||||
TestAny = _reflection.GeneratedProtocolMessageType('TestAny', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTANY,
|
||||
'__module__' : 'google.protobuf.any_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:protobuf_unittest.TestAny)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestAny)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'B\014TestAnyProto'
|
||||
_TESTANY._serialized_start=81
|
||||
_TESTANY._serialized_end=216
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/api.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -16,234 +16,42 @@ from google.protobuf import source_context_pb2 as google_dot_protobuf_dot_source
|
||||
from google.protobuf import type_pb2 as google_dot_protobuf_dot_type__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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(\tBv\n\x13\x63om.google.protobufB\x08\x41piProtoP\x01Z,google.golang.org/protobuf/types/known/apipb\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
|
||||
|
||||
|
||||
|
||||
_API = _descriptor.Descriptor(
|
||||
name='Api',
|
||||
full_name='google.protobuf.Api',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='name', full_name='google.protobuf.Api.name', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=113,
|
||||
serialized_end=370,
|
||||
)
|
||||
|
||||
|
||||
_METHOD = _descriptor.Descriptor(
|
||||
name='Method',
|
||||
full_name='google.protobuf.Method',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='name', full_name='google.protobuf.Method.name', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=373,
|
||||
serialized_end=586,
|
||||
)
|
||||
|
||||
|
||||
_MIXIN = _descriptor.Descriptor(
|
||||
name='Mixin',
|
||||
full_name='google.protobuf.Mixin',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='name', full_name='google.protobuf.Mixin.name', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=588,
|
||||
serialized_end=623,
|
||||
)
|
||||
|
||||
_API.fields_by_name['methods'].message_type = _METHOD
|
||||
_API.fields_by_name['options'].message_type = google_dot_protobuf_dot_type__pb2._OPTION
|
||||
_API.fields_by_name['source_context'].message_type = google_dot_protobuf_dot_source__context__pb2._SOURCECONTEXT
|
||||
_API.fields_by_name['mixins'].message_type = _MIXIN
|
||||
_API.fields_by_name['syntax'].enum_type = google_dot_protobuf_dot_type__pb2._SYNTAX
|
||||
_METHOD.fields_by_name['options'].message_type = google_dot_protobuf_dot_type__pb2._OPTION
|
||||
_METHOD.fields_by_name['syntax'].enum_type = google_dot_protobuf_dot_type__pb2._SYNTAX
|
||||
DESCRIPTOR.message_types_by_name['Api'] = _API
|
||||
DESCRIPTOR.message_types_by_name['Method'] = _METHOD
|
||||
DESCRIPTOR.message_types_by_name['Mixin'] = _MIXIN
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Api = _reflection.GeneratedProtocolMessageType('Api', (_message.Message,), dict(
|
||||
DESCRIPTOR = _API,
|
||||
__module__ = 'google.protobuf.api_pb2'
|
||||
_API = DESCRIPTOR.message_types_by_name['Api']
|
||||
_METHOD = DESCRIPTOR.message_types_by_name['Method']
|
||||
_MIXIN = DESCRIPTOR.message_types_by_name['Mixin']
|
||||
Api = _reflection.GeneratedProtocolMessageType('Api', (_message.Message,), {
|
||||
'DESCRIPTOR' : _API,
|
||||
'__module__' : 'google.protobuf.api_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.Api)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Api)
|
||||
|
||||
Method = _reflection.GeneratedProtocolMessageType('Method', (_message.Message,), dict(
|
||||
DESCRIPTOR = _METHOD,
|
||||
__module__ = 'google.protobuf.api_pb2'
|
||||
Method = _reflection.GeneratedProtocolMessageType('Method', (_message.Message,), {
|
||||
'DESCRIPTOR' : _METHOD,
|
||||
'__module__' : 'google.protobuf.api_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.Method)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Method)
|
||||
|
||||
Mixin = _reflection.GeneratedProtocolMessageType('Mixin', (_message.Message,), dict(
|
||||
DESCRIPTOR = _MIXIN,
|
||||
__module__ = 'google.protobuf.api_pb2'
|
||||
Mixin = _reflection.GeneratedProtocolMessageType('Mixin', (_message.Message,), {
|
||||
'DESCRIPTOR' : _MIXIN,
|
||||
'__module__' : 'google.protobuf.api_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.Mixin)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Mixin)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\010ApiProtoP\001Z,google.golang.org/protobuf/types/known/apipb\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'
|
||||
_API._serialized_start=113
|
||||
_API._serialized_end=370
|
||||
_METHOD._serialized_start=373
|
||||
_METHOD._serialized_end=586
|
||||
_MIXIN._serialized_start=588
|
||||
_MIXIN._serialized_end=623
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/compiler/plugin.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,241 +15,56 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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\"\xc1\x02\n\x15\x43odeGeneratorResponse\x12\r\n\x05\x65rror\x18\x01 \x01(\t\x12\x1a\n\x12supported_features\x18\x02 \x01(\x04\x12\x42\n\x04\x66ile\x18\x0f \x03(\x0b\x32\x34.google.protobuf.compiler.CodeGeneratorResponse.File\x1a\x7f\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(\t\x12?\n\x13generated_code_info\x18\x10 \x01(\x0b\x32\".google.protobuf.GeneratedCodeInfo\"8\n\x07\x46\x65\x61ture\x12\x10\n\x0c\x46\x45\x41TURE_NONE\x10\x00\x12\x1b\n\x17\x46\x45\x41TURE_PROTO3_OPTIONAL\x10\x01\x42W\n\x1c\x63om.google.protobuf.compilerB\x0cPluginProtosZ)google.golang.org/protobuf/types/pluginpb')
|
||||
|
||||
|
||||
|
||||
|
||||
_VERSION = _descriptor.Descriptor(
|
||||
name='Version',
|
||||
full_name='google.protobuf.compiler.Version',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='major', full_name='google.protobuf.compiler.Version.major', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=101,
|
||||
serialized_end=171,
|
||||
)
|
||||
|
||||
|
||||
_CODEGENERATORREQUEST = _descriptor.Descriptor(
|
||||
name='CodeGeneratorRequest',
|
||||
full_name='google.protobuf.compiler.CodeGeneratorRequest',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='file_to_generate', full_name='google.protobuf.compiler.CodeGeneratorRequest.file_to_generate', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=174,
|
||||
serialized_end=360,
|
||||
)
|
||||
|
||||
|
||||
_CODEGENERATORRESPONSE_FILE = _descriptor.Descriptor(
|
||||
name='File',
|
||||
full_name='google.protobuf.compiler.CodeGeneratorResponse.File',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='name', full_name='google.protobuf.compiler.CodeGeneratorResponse.File.name', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=471,
|
||||
serialized_end=533,
|
||||
)
|
||||
|
||||
_CODEGENERATORRESPONSE = _descriptor.Descriptor(
|
||||
name='CodeGeneratorResponse',
|
||||
full_name='google.protobuf.compiler.CodeGeneratorResponse',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='error', full_name='google.protobuf.compiler.CodeGeneratorResponse.error', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_CODEGENERATORRESPONSE_FILE, ],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=363,
|
||||
serialized_end=533,
|
||||
)
|
||||
|
||||
_CODEGENERATORREQUEST.fields_by_name['proto_file'].message_type = google_dot_protobuf_dot_descriptor__pb2._FILEDESCRIPTORPROTO
|
||||
_CODEGENERATORREQUEST.fields_by_name['compiler_version'].message_type = _VERSION
|
||||
_CODEGENERATORRESPONSE_FILE.containing_type = _CODEGENERATORRESPONSE
|
||||
_CODEGENERATORRESPONSE.fields_by_name['file'].message_type = _CODEGENERATORRESPONSE_FILE
|
||||
DESCRIPTOR.message_types_by_name['Version'] = _VERSION
|
||||
DESCRIPTOR.message_types_by_name['CodeGeneratorRequest'] = _CODEGENERATORREQUEST
|
||||
DESCRIPTOR.message_types_by_name['CodeGeneratorResponse'] = _CODEGENERATORRESPONSE
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Version = _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), dict(
|
||||
DESCRIPTOR = _VERSION,
|
||||
__module__ = 'google.protobuf.compiler.plugin_pb2'
|
||||
_VERSION = DESCRIPTOR.message_types_by_name['Version']
|
||||
_CODEGENERATORREQUEST = DESCRIPTOR.message_types_by_name['CodeGeneratorRequest']
|
||||
_CODEGENERATORRESPONSE = DESCRIPTOR.message_types_by_name['CodeGeneratorResponse']
|
||||
_CODEGENERATORRESPONSE_FILE = _CODEGENERATORRESPONSE.nested_types_by_name['File']
|
||||
_CODEGENERATORRESPONSE_FEATURE = _CODEGENERATORRESPONSE.enum_types_by_name['Feature']
|
||||
Version = _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), {
|
||||
'DESCRIPTOR' : _VERSION,
|
||||
'__module__' : 'google.protobuf.compiler.plugin_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.compiler.Version)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Version)
|
||||
|
||||
CodeGeneratorRequest = _reflection.GeneratedProtocolMessageType('CodeGeneratorRequest', (_message.Message,), dict(
|
||||
DESCRIPTOR = _CODEGENERATORREQUEST,
|
||||
__module__ = 'google.protobuf.compiler.plugin_pb2'
|
||||
CodeGeneratorRequest = _reflection.GeneratedProtocolMessageType('CodeGeneratorRequest', (_message.Message,), {
|
||||
'DESCRIPTOR' : _CODEGENERATORREQUEST,
|
||||
'__module__' : 'google.protobuf.compiler.plugin_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorRequest)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(CodeGeneratorRequest)
|
||||
|
||||
CodeGeneratorResponse = _reflection.GeneratedProtocolMessageType('CodeGeneratorResponse', (_message.Message,), dict(
|
||||
CodeGeneratorResponse = _reflection.GeneratedProtocolMessageType('CodeGeneratorResponse', (_message.Message,), {
|
||||
|
||||
File = _reflection.GeneratedProtocolMessageType('File', (_message.Message,), dict(
|
||||
DESCRIPTOR = _CODEGENERATORRESPONSE_FILE,
|
||||
__module__ = 'google.protobuf.compiler.plugin_pb2'
|
||||
'File' : _reflection.GeneratedProtocolMessageType('File', (_message.Message,), {
|
||||
'DESCRIPTOR' : _CODEGENERATORRESPONSE_FILE,
|
||||
'__module__' : 'google.protobuf.compiler.plugin_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorResponse.File)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _CODEGENERATORRESPONSE,
|
||||
__module__ = 'google.protobuf.compiler.plugin_pb2'
|
||||
'DESCRIPTOR' : _CODEGENERATORRESPONSE,
|
||||
'__module__' : 'google.protobuf.compiler.plugin_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorResponse)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(CodeGeneratorResponse)
|
||||
_sym_db.RegisterMessage(CodeGeneratorResponse.File)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\034com.google.protobuf.compilerB\014PluginProtosZ)google.golang.org/protobuf/types/pluginpb'
|
||||
_VERSION._serialized_start=101
|
||||
_VERSION._serialized_end=171
|
||||
_CODEGENERATORREQUEST._serialized_start=174
|
||||
_CODEGENERATORREQUEST._serialized_end=360
|
||||
_CODEGENERATORRESPONSE._serialized_start=363
|
||||
_CODEGENERATORRESPONSE._serialized_end=684
|
||||
_CODEGENERATORRESPONSE_FILE._serialized_start=499
|
||||
_CODEGENERATORRESPONSE_FILE._serialized_end=626
|
||||
_CODEGENERATORRESPONSE_FEATURE._serialized_start=628
|
||||
_CODEGENERATORRESPONSE_FEATURE._serialized_end=684
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Executable → Regular
+282
-176
@@ -35,7 +35,7 @@ file, in types that make this information accessible in Python.
|
||||
__author__ = 'robinson@google.com (Will Robinson)'
|
||||
|
||||
import threading
|
||||
import six
|
||||
import warnings
|
||||
|
||||
from google.protobuf.internal import api_implementation
|
||||
|
||||
@@ -45,7 +45,7 @@ if api_implementation.Type() == 'cpp':
|
||||
import binascii
|
||||
import os
|
||||
from google.protobuf.pyext import _message
|
||||
_USE_C_DESCRIPTORS = getattr(_message, '_USE_C_DESCRIPTORS', False)
|
||||
_USE_C_DESCRIPTORS = True
|
||||
|
||||
|
||||
class Error(Exception):
|
||||
@@ -91,7 +91,26 @@ class _Lock(object):
|
||||
_lock = threading.Lock()
|
||||
|
||||
|
||||
class DescriptorBase(six.with_metaclass(DescriptorMetaclass)):
|
||||
def _Deprecated(name):
|
||||
if _Deprecated.count > 0:
|
||||
_Deprecated.count -= 1
|
||||
warnings.warn(
|
||||
'Call to deprecated create function %s(). Note: Create unlinked '
|
||||
'descriptors is going to go away. Please use get/find descriptors from '
|
||||
'generated code or query the descriptor_pool.'
|
||||
% name,
|
||||
category=DeprecationWarning, stacklevel=3)
|
||||
|
||||
|
||||
# Deprecated warnings will print 100 times at most which should be enough for
|
||||
# users to notice and do not cause timeout.
|
||||
_Deprecated.count = 100
|
||||
|
||||
|
||||
_internal_create_key = object()
|
||||
|
||||
|
||||
class DescriptorBase(metaclass=DescriptorMetaclass):
|
||||
|
||||
"""Descriptors base class.
|
||||
|
||||
@@ -173,20 +192,19 @@ class _NestedDescriptorBase(DescriptorBase):
|
||||
Args:
|
||||
options: Protocol message options or None
|
||||
to use default message options.
|
||||
options_class_name: (str) The class name of the above options.
|
||||
|
||||
name: (str) Name of this protocol message type.
|
||||
full_name: (str) Fully-qualified name of this protocol message type,
|
||||
options_class_name (str): The class name of the above options.
|
||||
name (str): Name of this protocol message type.
|
||||
full_name (str): Fully-qualified name of this protocol message type,
|
||||
which will include protocol "package" name and the name of any
|
||||
enclosing types.
|
||||
file: (FileDescriptor) Reference to file info.
|
||||
file (FileDescriptor): Reference to file info.
|
||||
containing_type: if provided, this is a nested descriptor, with this
|
||||
descriptor as parent, otherwise None.
|
||||
serialized_start: The start index (inclusive) in block in the
|
||||
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.
|
||||
serialized_options: Protocol message serialized options or None.
|
||||
"""
|
||||
super(_NestedDescriptorBase, self).__init__(
|
||||
options, serialized_options, options_class_name)
|
||||
@@ -208,7 +226,8 @@ class _NestedDescriptorBase(DescriptorBase):
|
||||
proto: An empty proto instance from descriptor_pb2.
|
||||
|
||||
Raises:
|
||||
Error: If self couldnt be serialized, due to to few constructor arguments.
|
||||
Error: If self couldn't be serialized, due to to few constructor
|
||||
arguments.
|
||||
"""
|
||||
if (self.file is not None and
|
||||
self._serialized_start is not None and
|
||||
@@ -223,67 +242,70 @@ class Descriptor(_NestedDescriptorBase):
|
||||
|
||||
"""Descriptor for a protocol message type.
|
||||
|
||||
A Descriptor instance has the following attributes:
|
||||
Attributes:
|
||||
name (str): Name of this protocol message type.
|
||||
full_name (str): Fully-qualified name of this protocol message type,
|
||||
which will include protocol "package" name and the name of any
|
||||
enclosing types.
|
||||
containing_type (Descriptor): Reference to the descriptor of the type
|
||||
containing us, or None if this is top-level.
|
||||
fields (list[FieldDescriptor]): Field descriptors for all fields in
|
||||
this type.
|
||||
fields_by_number (dict(int, FieldDescriptor)): Same
|
||||
:class:`FieldDescriptor` objects as in :attr:`fields`, but indexed
|
||||
by "number" attribute in each FieldDescriptor.
|
||||
fields_by_name (dict(str, FieldDescriptor)): Same
|
||||
:class:`FieldDescriptor` objects as in :attr:`fields`, but indexed by
|
||||
"name" attribute in each :class:`FieldDescriptor`.
|
||||
nested_types (list[Descriptor]): Descriptor references
|
||||
for all protocol message types nested within this one.
|
||||
nested_types_by_name (dict(str, Descriptor)): Same Descriptor
|
||||
objects as in :attr:`nested_types`, but indexed by "name" attribute
|
||||
in each Descriptor.
|
||||
enum_types (list[EnumDescriptor]): :class:`EnumDescriptor` references
|
||||
for all enums contained within this type.
|
||||
enum_types_by_name (dict(str, EnumDescriptor)): Same
|
||||
:class:`EnumDescriptor` objects as in :attr:`enum_types`, but
|
||||
indexed by "name" attribute in each EnumDescriptor.
|
||||
enum_values_by_name (dict(str, EnumValueDescriptor)): Dict mapping
|
||||
from enum value name to :class:`EnumValueDescriptor` for that value.
|
||||
extensions (list[FieldDescriptor]): All extensions defined directly
|
||||
within this message type (NOT within a nested type).
|
||||
extensions_by_name (dict(str, FieldDescriptor)): Same FieldDescriptor
|
||||
objects as :attr:`extensions`, but indexed by "name" attribute of each
|
||||
FieldDescriptor.
|
||||
is_extendable (bool): Does this type define any extension ranges?
|
||||
oneofs (list[OneofDescriptor]): The list of descriptors for oneof fields
|
||||
in this message.
|
||||
oneofs_by_name (dict(str, OneofDescriptor)): Same objects as in
|
||||
:attr:`oneofs`, but indexed by "name" attribute.
|
||||
file (FileDescriptor): Reference to file descriptor.
|
||||
|
||||
name: (str) Name of this protocol message type.
|
||||
full_name: (str) Fully-qualified name of this protocol message type,
|
||||
which will include protocol "package" name and the name of any
|
||||
enclosing types.
|
||||
|
||||
containing_type: (Descriptor) Reference to the descriptor of the
|
||||
type containing us, or None if this is top-level.
|
||||
|
||||
fields: (list of FieldDescriptors) Field descriptors for all
|
||||
fields in this type.
|
||||
fields_by_number: (dict int -> FieldDescriptor) Same FieldDescriptor
|
||||
objects as in |fields|, but indexed by "number" attribute in each
|
||||
FieldDescriptor.
|
||||
fields_by_name: (dict str -> FieldDescriptor) Same FieldDescriptor
|
||||
objects as in |fields|, but indexed by "name" attribute in each
|
||||
FieldDescriptor.
|
||||
fields_by_camelcase_name: (dict str -> FieldDescriptor) Same
|
||||
FieldDescriptor objects as in |fields|, but indexed by
|
||||
"camelcase_name" attribute in each FieldDescriptor.
|
||||
|
||||
nested_types: (list of Descriptors) Descriptor references
|
||||
for all protocol message types nested within this one.
|
||||
nested_types_by_name: (dict str -> Descriptor) Same Descriptor
|
||||
objects as in |nested_types|, but indexed by "name" attribute
|
||||
in each Descriptor.
|
||||
|
||||
enum_types: (list of EnumDescriptors) EnumDescriptor references
|
||||
for all enums contained within this type.
|
||||
enum_types_by_name: (dict str ->EnumDescriptor) Same EnumDescriptor
|
||||
objects as in |enum_types|, but indexed by "name" attribute
|
||||
in each EnumDescriptor.
|
||||
enum_values_by_name: (dict str -> EnumValueDescriptor) Dict mapping
|
||||
from enum value name to EnumValueDescriptor for that value.
|
||||
|
||||
extensions: (list of FieldDescriptor) All extensions defined directly
|
||||
within this message type (NOT within a nested type).
|
||||
extensions_by_name: (dict, string -> FieldDescriptor) Same FieldDescriptor
|
||||
objects as |extensions|, but indexed by "name" attribute of each
|
||||
FieldDescriptor.
|
||||
|
||||
is_extendable: Does this type define any extension ranges?
|
||||
|
||||
oneofs: (list of OneofDescriptor) The list of descriptors for oneof fields
|
||||
in this message.
|
||||
oneofs_by_name: (dict str -> OneofDescriptor) Same objects as in |oneofs|,
|
||||
but indexed by "name" attribute.
|
||||
|
||||
file: (FileDescriptor) Reference to file descriptor.
|
||||
"""
|
||||
|
||||
if _USE_C_DESCRIPTORS:
|
||||
_C_DESCRIPTOR_CLASS = _message.Descriptor
|
||||
|
||||
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):
|
||||
def __new__(
|
||||
cls,
|
||||
name=None,
|
||||
full_name=None,
|
||||
filename=None,
|
||||
containing_type=None,
|
||||
fields=None,
|
||||
nested_types=None,
|
||||
enum_types=None,
|
||||
extensions=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
extension_ranges=None,
|
||||
oneofs=None,
|
||||
file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None,
|
||||
serialized_end=None,
|
||||
syntax=None,
|
||||
create_key=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
return _message.default_pool.FindMessageTypeByName(full_name)
|
||||
|
||||
@@ -295,13 +317,16 @@ class Descriptor(_NestedDescriptorBase):
|
||||
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):
|
||||
syntax=None, create_key=None):
|
||||
"""Arguments to __init__() are as described in the description
|
||||
of Descriptor fields above.
|
||||
|
||||
Note that filename is an obsolete argument, that is not used anymore.
|
||||
Please use file.name to access this as an attribute.
|
||||
"""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('Descriptor')
|
||||
|
||||
super(Descriptor, self).__init__(
|
||||
options, 'MessageOptions', name, full_name, file,
|
||||
containing_type, serialized_start=serialized_start,
|
||||
@@ -345,6 +370,9 @@ class Descriptor(_NestedDescriptorBase):
|
||||
|
||||
@property
|
||||
def fields_by_camelcase_name(self):
|
||||
"""Same FieldDescriptor objects as in :attr:`fields`, but indexed by
|
||||
:attr:`FieldDescriptor.camelcase_name`.
|
||||
"""
|
||||
if self._fields_by_camelcase_name is None:
|
||||
self._fields_by_camelcase_name = dict(
|
||||
(f.camelcase_name, f) for f in self.fields)
|
||||
@@ -393,53 +421,51 @@ class FieldDescriptor(DescriptorBase):
|
||||
|
||||
"""Descriptor for a single field in a .proto file.
|
||||
|
||||
A FieldDescriptor instance has the following attributes:
|
||||
|
||||
name: (str) Name of this field, exactly as it appears in .proto.
|
||||
full_name: (str) Name of this field, including containing scope. This is
|
||||
Attributes:
|
||||
name (str): Name of this field, exactly as it appears in .proto.
|
||||
full_name (str): Name of this field, including containing scope. This is
|
||||
particularly relevant for extensions.
|
||||
camelcase_name: (str) Camelcase name of this field.
|
||||
index: (int) Dense, 0-indexed index giving the order that this
|
||||
index (int): Dense, 0-indexed index giving the order that this
|
||||
field textually appears within its message in the .proto file.
|
||||
number: (int) Tag number declared for this field in the .proto file.
|
||||
number (int): Tag number declared for this field in the .proto file.
|
||||
|
||||
type: (One of the TYPE_* constants below) Declared type.
|
||||
cpp_type: (One of the CPPTYPE_* constants below) C++ type used to
|
||||
type (int): (One of the TYPE_* constants below) Declared type.
|
||||
cpp_type (int): (One of the CPPTYPE_* constants below) C++ type used to
|
||||
represent this field.
|
||||
|
||||
label: (One of the LABEL_* constants below) Tells whether this
|
||||
label (int): (One of the LABEL_* constants below) Tells whether this
|
||||
field is optional, required, or repeated.
|
||||
has_default_value: (bool) True if this field has a default value defined,
|
||||
has_default_value (bool): True if this field has a default value defined,
|
||||
otherwise false.
|
||||
default_value: (Varies) Default value of this field. Only
|
||||
default_value (Varies): Default value of this field. Only
|
||||
meaningful for non-repeated scalar fields. Repeated fields
|
||||
should always set this to [], and non-repeated composite
|
||||
fields should always set this to None.
|
||||
|
||||
containing_type: (Descriptor) Descriptor of the protocol message
|
||||
containing_type (Descriptor): Descriptor of the protocol message
|
||||
type that contains this field. Set by the Descriptor constructor
|
||||
if we're passed into one.
|
||||
Somewhat confusingly, for extension fields, this is the
|
||||
descriptor of the EXTENDED message, not the descriptor
|
||||
of the message containing this field. (See is_extension and
|
||||
extension_scope below).
|
||||
message_type: (Descriptor) If a composite field, a descriptor
|
||||
message_type (Descriptor): If a composite field, a descriptor
|
||||
of the message type contained in this field. Otherwise, this is None.
|
||||
enum_type: (EnumDescriptor) If this field contains an enum, a
|
||||
enum_type (EnumDescriptor): If this field contains an enum, a
|
||||
descriptor of that enum. Otherwise, this is None.
|
||||
|
||||
is_extension: True iff this describes an extension field.
|
||||
extension_scope: (Descriptor) Only meaningful if is_extension is True.
|
||||
extension_scope (Descriptor): Only meaningful if is_extension is True.
|
||||
Gives the message that immediately contains this extension field.
|
||||
Will be None iff we're a top-level (file-level) extension field.
|
||||
|
||||
options: (descriptor_pb2.FieldOptions) Protocol message field options or
|
||||
options (descriptor_pb2.FieldOptions): Protocol message field options or
|
||||
None to use default field options.
|
||||
|
||||
containing_oneof: (OneofDescriptor) If the field is a member of a oneof
|
||||
containing_oneof (OneofDescriptor): If the field is a member of a oneof
|
||||
union, contains its descriptor. Otherwise, None.
|
||||
|
||||
file: (FileDescriptor) Reference to file descriptor.
|
||||
file (FileDescriptor): Reference to file descriptor.
|
||||
"""
|
||||
|
||||
# Must be consistent with C++ FieldDescriptor::Type enum in
|
||||
@@ -526,7 +552,7 @@ class FieldDescriptor(DescriptorBase):
|
||||
is_extension, extension_scope, options=None,
|
||||
serialized_options=None,
|
||||
has_default_value=True, containing_oneof=None, json_name=None,
|
||||
file=None): # pylint: disable=redefined-builtin
|
||||
file=None, create_key=None): # pylint: disable=redefined-builtin
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
if is_extension:
|
||||
return _message.default_pool.FindExtensionByName(full_name)
|
||||
@@ -538,7 +564,7 @@ class FieldDescriptor(DescriptorBase):
|
||||
is_extension, extension_scope, options=None,
|
||||
serialized_options=None,
|
||||
has_default_value=True, containing_oneof=None, json_name=None,
|
||||
file=None): # pylint: disable=redefined-builtin
|
||||
file=None, create_key=None): # pylint: disable=redefined-builtin
|
||||
"""The arguments are as described in the description of FieldDescriptor
|
||||
attributes above.
|
||||
|
||||
@@ -546,6 +572,9 @@ class FieldDescriptor(DescriptorBase):
|
||||
(to deal with circular references between message types, for example).
|
||||
Likewise for extension_scope.
|
||||
"""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('FieldDescriptor')
|
||||
|
||||
super(FieldDescriptor, self).__init__(
|
||||
options, serialized_options, 'FieldOptions')
|
||||
self.name = name
|
||||
@@ -579,6 +608,11 @@ class FieldDescriptor(DescriptorBase):
|
||||
|
||||
@property
|
||||
def camelcase_name(self):
|
||||
"""Camelcase name of this field.
|
||||
|
||||
Returns:
|
||||
str: the name in CamelCase.
|
||||
"""
|
||||
if self._camelcase_name is None:
|
||||
self._camelcase_name = _ToCamelCase(self.name)
|
||||
return self._camelcase_name
|
||||
@@ -594,7 +628,7 @@ class FieldDescriptor(DescriptorBase):
|
||||
Args:
|
||||
proto_type: the Python proto type (descriptor.FieldDescriptor.TYPE_*)
|
||||
Returns:
|
||||
descriptor.FieldDescriptor.CPPTYPE_*, the C++ type.
|
||||
int: descriptor.FieldDescriptor.CPPTYPE_*, the C++ type.
|
||||
Raises:
|
||||
TypeTransformationError: when the Python proto type isn't known.
|
||||
"""
|
||||
@@ -608,24 +642,23 @@ class EnumDescriptor(_NestedDescriptorBase):
|
||||
|
||||
"""Descriptor for an enum defined in a .proto file.
|
||||
|
||||
An EnumDescriptor instance has the following attributes:
|
||||
|
||||
name: (str) Name of the enum type.
|
||||
full_name: (str) Full name of the type, including package name
|
||||
Attributes:
|
||||
name (str): Name of the enum type.
|
||||
full_name (str): Full name of the type, including package name
|
||||
and any enclosing type(s).
|
||||
|
||||
values: (list of EnumValueDescriptors) List of the values
|
||||
values (list[EnumValueDescriptors]): List of the values
|
||||
in this enum.
|
||||
values_by_name: (dict str -> EnumValueDescriptor) Same as |values|,
|
||||
values_by_name (dict(str, EnumValueDescriptor)): Same as :attr:`values`,
|
||||
but indexed by the "name" field of each EnumValueDescriptor.
|
||||
values_by_number: (dict int -> EnumValueDescriptor) Same as |values|,
|
||||
values_by_number (dict(int, EnumValueDescriptor)): Same as :attr:`values`,
|
||||
but indexed by the "number" field of each EnumValueDescriptor.
|
||||
containing_type: (Descriptor) Descriptor of the immediate containing
|
||||
containing_type (Descriptor): Descriptor of the immediate containing
|
||||
type of this enum, or None if this is an enum defined at the
|
||||
top level in a .proto file. Set by Descriptor's constructor
|
||||
if we're passed into one.
|
||||
file: (FileDescriptor) Reference to file descriptor.
|
||||
options: (descriptor_pb2.EnumOptions) Enum options message or
|
||||
file (FileDescriptor): Reference to file descriptor.
|
||||
options (descriptor_pb2.EnumOptions): Enum options message or
|
||||
None to use default enum options.
|
||||
"""
|
||||
|
||||
@@ -635,19 +668,22 @@ class EnumDescriptor(_NestedDescriptorBase):
|
||||
def __new__(cls, name, full_name, filename, values,
|
||||
containing_type=None, options=None,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
serialized_start=None, serialized_end=None, create_key=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
return _message.default_pool.FindEnumTypeByName(full_name)
|
||||
|
||||
def __init__(self, name, full_name, filename, values,
|
||||
containing_type=None, options=None,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
serialized_start=None, serialized_end=None, create_key=None):
|
||||
"""Arguments are as described in the attribute description above.
|
||||
|
||||
Note that filename is an obsolete argument, that is not used anymore.
|
||||
Please use file.name to access this as an attribute.
|
||||
"""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('EnumDescriptor')
|
||||
|
||||
super(EnumDescriptor, self).__init__(
|
||||
options, 'EnumOptions', name, full_name, file,
|
||||
containing_type, serialized_start=serialized_start,
|
||||
@@ -657,13 +693,14 @@ class EnumDescriptor(_NestedDescriptorBase):
|
||||
for value in self.values:
|
||||
value.type = self
|
||||
self.values_by_name = dict((v.name, v) for v in values)
|
||||
self.values_by_number = dict((v.number, v) for v in values)
|
||||
# Values are reversed to ensure that the first alias is retained.
|
||||
self.values_by_number = dict((v.number, v) for v in reversed(values))
|
||||
|
||||
def CopyToProto(self, proto):
|
||||
"""Copies this to a descriptor_pb2.EnumDescriptorProto.
|
||||
|
||||
Args:
|
||||
proto: An empty descriptor_pb2.EnumDescriptorProto.
|
||||
proto (descriptor_pb2.EnumDescriptorProto): An empty descriptor proto.
|
||||
"""
|
||||
# This function is overridden to give a better doc comment.
|
||||
super(EnumDescriptor, self).CopyToProto(proto)
|
||||
@@ -673,14 +710,15 @@ class EnumValueDescriptor(DescriptorBase):
|
||||
|
||||
"""Descriptor for a single value within an enum.
|
||||
|
||||
name: (str) Name of this value.
|
||||
index: (int) Dense, 0-indexed index giving the order that this
|
||||
Attributes:
|
||||
name (str): Name of this value.
|
||||
index (int): Dense, 0-indexed index giving the order that this
|
||||
value appears textually within its enum in the .proto file.
|
||||
number: (int) Actual number assigned to this enum value.
|
||||
type: (EnumDescriptor) EnumDescriptor to which this value
|
||||
belongs. Set by EnumDescriptor's constructor if we're
|
||||
number (int): Actual number assigned to this enum value.
|
||||
type (EnumDescriptor): :class:`EnumDescriptor` to which this value
|
||||
belongs. Set by :class:`EnumDescriptor`'s constructor if we're
|
||||
passed into one.
|
||||
options: (descriptor_pb2.EnumValueOptions) Enum value options message or
|
||||
options (descriptor_pb2.EnumValueOptions): Enum value options message or
|
||||
None to use default enum value options options.
|
||||
"""
|
||||
|
||||
@@ -689,7 +727,7 @@ class EnumValueDescriptor(DescriptorBase):
|
||||
|
||||
def __new__(cls, name, index, number,
|
||||
type=None, # pylint: disable=redefined-builtin
|
||||
options=None, serialized_options=None):
|
||||
options=None, serialized_options=None, create_key=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).
|
||||
@@ -699,8 +737,11 @@ class EnumValueDescriptor(DescriptorBase):
|
||||
|
||||
def __init__(self, name, index, number,
|
||||
type=None, # pylint: disable=redefined-builtin
|
||||
options=None, serialized_options=None):
|
||||
options=None, serialized_options=None, create_key=None):
|
||||
"""Arguments are as described in the attribute description above."""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('EnumValueDescriptor')
|
||||
|
||||
super(EnumValueDescriptor, self).__init__(
|
||||
options, serialized_options, 'EnumValueOptions')
|
||||
self.name = name
|
||||
@@ -712,14 +753,15 @@ class EnumValueDescriptor(DescriptorBase):
|
||||
class OneofDescriptor(DescriptorBase):
|
||||
"""Descriptor for a oneof field.
|
||||
|
||||
name: (str) Name of the oneof field.
|
||||
full_name: (str) Full name of the oneof field, including package name.
|
||||
index: (int) 0-based index giving the order of the oneof field inside
|
||||
Attributes:
|
||||
name (str): Name of the oneof field.
|
||||
full_name (str): Full name of the oneof field, including package name.
|
||||
index (int): 0-based index giving the order of the oneof field inside
|
||||
its containing type.
|
||||
containing_type: (Descriptor) Descriptor of the protocol message
|
||||
type that contains this field. Set by the Descriptor constructor
|
||||
containing_type (Descriptor): :class:`Descriptor` of the protocol message
|
||||
type that contains this field. Set by the :class:`Descriptor` constructor
|
||||
if we're passed into one.
|
||||
fields: (list of FieldDescriptor) The list of field descriptors this
|
||||
fields (list[FieldDescriptor]): The list of field descriptors this
|
||||
oneof can contain.
|
||||
"""
|
||||
|
||||
@@ -728,14 +770,17 @@ class OneofDescriptor(DescriptorBase):
|
||||
|
||||
def __new__(
|
||||
cls, name, full_name, index, containing_type, fields, options=None,
|
||||
serialized_options=None):
|
||||
serialized_options=None, create_key=None):
|
||||
_message.Message._CheckCalledFromGeneratedFile()
|
||||
return _message.default_pool.FindOneofByName(full_name)
|
||||
|
||||
def __init__(
|
||||
self, name, full_name, index, containing_type, fields, options=None,
|
||||
serialized_options=None):
|
||||
serialized_options=None, create_key=None):
|
||||
"""Arguments are as described in the attribute description above."""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('OneofDescriptor')
|
||||
|
||||
super(OneofDescriptor, self).__init__(
|
||||
options, serialized_options, 'OneofOptions')
|
||||
self.name = name
|
||||
@@ -749,32 +794,45 @@ class ServiceDescriptor(_NestedDescriptorBase):
|
||||
|
||||
"""Descriptor for a service.
|
||||
|
||||
name: (str) Name of the service.
|
||||
full_name: (str) Full name of the service, including package name.
|
||||
index: (int) 0-indexed index giving the order that this services
|
||||
definition appears withing the .proto file.
|
||||
methods: (list of MethodDescriptor) List of methods provided by this
|
||||
Attributes:
|
||||
name (str): Name of the service.
|
||||
full_name (str): Full name of the service, including package name.
|
||||
index (int): 0-indexed index giving the order that this services
|
||||
definition appears within the .proto file.
|
||||
methods (list[MethodDescriptor]): List of methods provided by this
|
||||
service.
|
||||
methods_by_name: (dict str -> MethodDescriptor) Same MethodDescriptor
|
||||
objects as in |methods_by_name|, but indexed by "name" attribute in each
|
||||
MethodDescriptor.
|
||||
options: (descriptor_pb2.ServiceOptions) Service options message or
|
||||
methods_by_name (dict(str, MethodDescriptor)): Same
|
||||
:class:`MethodDescriptor` objects as in :attr:`methods_by_name`, but
|
||||
indexed by "name" attribute in each :class:`MethodDescriptor`.
|
||||
options (descriptor_pb2.ServiceOptions): Service options message or
|
||||
None to use default service options.
|
||||
file: (FileDescriptor) Reference to file info.
|
||||
file (FileDescriptor): Reference to file info.
|
||||
"""
|
||||
|
||||
if _USE_C_DESCRIPTORS:
|
||||
_C_DESCRIPTOR_CLASS = _message.ServiceDescriptor
|
||||
|
||||
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):
|
||||
def __new__(
|
||||
cls,
|
||||
name=None,
|
||||
full_name=None,
|
||||
index=None,
|
||||
methods=None,
|
||||
options=None,
|
||||
serialized_options=None,
|
||||
file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None,
|
||||
serialized_end=None,
|
||||
create_key=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,
|
||||
serialized_options=None, file=None, # pylint: disable=redefined-builtin
|
||||
serialized_start=None, serialized_end=None):
|
||||
serialized_start=None, serialized_end=None, create_key=None):
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('ServiceDescriptor')
|
||||
|
||||
super(ServiceDescriptor, self).__init__(
|
||||
options, 'ServiceOptions', name, full_name, file,
|
||||
None, serialized_start=serialized_start,
|
||||
@@ -787,14 +845,21 @@ class ServiceDescriptor(_NestedDescriptorBase):
|
||||
method.containing_service = self
|
||||
|
||||
def FindMethodByName(self, name):
|
||||
"""Searches for the specified method, and returns its descriptor."""
|
||||
"""Searches for the specified method, and returns its descriptor.
|
||||
|
||||
Args:
|
||||
name (str): Name of the method.
|
||||
Returns:
|
||||
MethodDescriptor or None: the descriptor for the requested method, if
|
||||
found.
|
||||
"""
|
||||
return self.methods_by_name.get(name, None)
|
||||
|
||||
def CopyToProto(self, proto):
|
||||
"""Copies this to a descriptor_pb2.ServiceDescriptorProto.
|
||||
|
||||
Args:
|
||||
proto: An empty descriptor_pb2.ServiceDescriptorProto.
|
||||
proto (descriptor_pb2.ServiceDescriptorProto): An empty descriptor proto.
|
||||
"""
|
||||
# This function is overridden to give a better doc comment.
|
||||
super(ServiceDescriptor, self).CopyToProto(proto)
|
||||
@@ -804,32 +869,40 @@ class MethodDescriptor(DescriptorBase):
|
||||
|
||||
"""Descriptor for a method in a service.
|
||||
|
||||
name: (str) Name of the method within the service.
|
||||
full_name: (str) Full name of method.
|
||||
index: (int) 0-indexed index of the method inside the service.
|
||||
containing_service: (ServiceDescriptor) The service that contains this
|
||||
method.
|
||||
input_type: The descriptor of the message that this method accepts.
|
||||
output_type: The descriptor of the message that this method returns.
|
||||
options: (descriptor_pb2.MethodOptions) Method options message or
|
||||
None to use default method options.
|
||||
Attributes:
|
||||
name (str): Name of the method within the service.
|
||||
full_name (str): Full name of method.
|
||||
index (int): 0-indexed index of the method inside the service.
|
||||
containing_service (ServiceDescriptor): The service that contains this
|
||||
method.
|
||||
input_type (Descriptor): The descriptor of the message that this method
|
||||
accepts.
|
||||
output_type (Descriptor): The descriptor of the message that this method
|
||||
returns.
|
||||
options (descriptor_pb2.MethodOptions or None): Method options message, or
|
||||
None to use default method options.
|
||||
"""
|
||||
|
||||
if _USE_C_DESCRIPTORS:
|
||||
_C_DESCRIPTOR_CLASS = _message.MethodDescriptor
|
||||
|
||||
def __new__(cls, name, full_name, index, containing_service,
|
||||
input_type, output_type, options=None, serialized_options=None):
|
||||
input_type, output_type, options=None, serialized_options=None,
|
||||
create_key=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, serialized_options=None):
|
||||
input_type, output_type, options=None, serialized_options=None,
|
||||
create_key=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.
|
||||
"""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('MethodDescriptor')
|
||||
|
||||
super(MethodDescriptor, self).__init__(
|
||||
options, serialized_options, 'MethodOptions')
|
||||
self.name = name
|
||||
@@ -839,28 +912,54 @@ class MethodDescriptor(DescriptorBase):
|
||||
self.input_type = input_type
|
||||
self.output_type = output_type
|
||||
|
||||
def CopyToProto(self, proto):
|
||||
"""Copies this to a descriptor_pb2.MethodDescriptorProto.
|
||||
|
||||
Args:
|
||||
proto (descriptor_pb2.MethodDescriptorProto): An empty descriptor proto.
|
||||
|
||||
Raises:
|
||||
Error: If self couldn't be serialized, due to too few constructor
|
||||
arguments.
|
||||
"""
|
||||
if self.containing_service is not None:
|
||||
from google.protobuf import descriptor_pb2
|
||||
service_proto = descriptor_pb2.ServiceDescriptorProto()
|
||||
self.containing_service.CopyToProto(service_proto)
|
||||
proto.CopyFrom(service_proto.method[self.index])
|
||||
else:
|
||||
raise Error('Descriptor does not contain a service.')
|
||||
|
||||
|
||||
class FileDescriptor(DescriptorBase):
|
||||
"""Descriptor for a file. Mimics the descriptor_pb2.FileDescriptorProto.
|
||||
|
||||
Note that enum_types_by_name, extensions_by_name, and dependencies
|
||||
fields are only set by the message_factory module, and not by the
|
||||
generated proto code.
|
||||
Note that :attr:`enum_types_by_name`, :attr:`extensions_by_name`, and
|
||||
:attr:`dependencies` fields are only set by the
|
||||
:py:mod:`google.protobuf.message_factory` module, and not by the generated
|
||||
proto code.
|
||||
|
||||
name: name of file, relative to root of source tree.
|
||||
package: name of the package
|
||||
syntax: string indicating syntax of the file (can be "proto2" or "proto3")
|
||||
serialized_pb: (str) Byte string of serialized
|
||||
descriptor_pb2.FileDescriptorProto.
|
||||
dependencies: List of other FileDescriptors this FileDescriptor depends on.
|
||||
public_dependencies: A list of FileDescriptors, subset of the dependencies
|
||||
above, which were declared as "public".
|
||||
message_types_by_name: Dict of message names of their descriptors.
|
||||
enum_types_by_name: Dict of enum names and their descriptors.
|
||||
extensions_by_name: Dict of extension names and their descriptors.
|
||||
services_by_name: Dict of services names and their descriptors.
|
||||
pool: the DescriptorPool this descriptor belongs to. When not passed to the
|
||||
constructor, the global default pool is used.
|
||||
Attributes:
|
||||
name (str): Name of file, relative to root of source tree.
|
||||
package (str): Name of the package
|
||||
syntax (str): string indicating syntax of the file (can be "proto2" or
|
||||
"proto3")
|
||||
serialized_pb (bytes): Byte string of serialized
|
||||
:class:`descriptor_pb2.FileDescriptorProto`.
|
||||
dependencies (list[FileDescriptor]): List of other :class:`FileDescriptor`
|
||||
objects this :class:`FileDescriptor` depends on.
|
||||
public_dependencies (list[FileDescriptor]): A subset of
|
||||
:attr:`dependencies`, which were declared as "public".
|
||||
message_types_by_name (dict(str, Descriptor)): Mapping from message names
|
||||
to their :class:`Descriptor`.
|
||||
enum_types_by_name (dict(str, EnumDescriptor)): Mapping from enum names to
|
||||
their :class:`EnumDescriptor`.
|
||||
extensions_by_name (dict(str, FieldDescriptor)): Mapping from extension
|
||||
names declared at file scope to their :class:`FieldDescriptor`.
|
||||
services_by_name (dict(str, ServiceDescriptor)): Mapping from services'
|
||||
names to their :class:`ServiceDescriptor`.
|
||||
pool (DescriptorPool): The pool this descriptor belongs to. When not
|
||||
passed to the constructor, the global default pool is used.
|
||||
"""
|
||||
|
||||
if _USE_C_DESCRIPTORS:
|
||||
@@ -869,12 +968,17 @@ class FileDescriptor(DescriptorBase):
|
||||
def __new__(cls, name, package, options=None,
|
||||
serialized_options=None, serialized_pb=None,
|
||||
dependencies=None, public_dependencies=None,
|
||||
syntax=None, pool=None):
|
||||
syntax=None, pool=None, create_key=None):
|
||||
# FileDescriptor() is called from various places, not only from generated
|
||||
# files, to register dynamic proto files and messages.
|
||||
if serialized_pb:
|
||||
# TODO(amauryfa): use the pool passed as argument. This will work only
|
||||
# for C++-implemented DescriptorPools.
|
||||
# pylint: disable=g-explicit-bool-comparison
|
||||
if serialized_pb == b'':
|
||||
# Cpp generated code must be linked in if serialized_pb is ''
|
||||
try:
|
||||
return _message.default_pool.FindFileByName(name)
|
||||
except KeyError:
|
||||
raise RuntimeError('Please link in cpp generated lib for %s' % (name))
|
||||
elif serialized_pb:
|
||||
return _message.default_pool.AddSerializedFile(serialized_pb)
|
||||
else:
|
||||
return super(FileDescriptor, cls).__new__(cls)
|
||||
@@ -882,8 +986,11 @@ class FileDescriptor(DescriptorBase):
|
||||
def __init__(self, name, package, options=None,
|
||||
serialized_options=None, serialized_pb=None,
|
||||
dependencies=None, public_dependencies=None,
|
||||
syntax=None, pool=None):
|
||||
syntax=None, pool=None, create_key=None):
|
||||
"""Constructor."""
|
||||
if create_key is not _internal_create_key:
|
||||
_Deprecated('FileDescriptor')
|
||||
|
||||
super(FileDescriptor, self).__init__(
|
||||
options, serialized_options, 'FileOptions')
|
||||
|
||||
@@ -903,10 +1010,6 @@ class FileDescriptor(DescriptorBase):
|
||||
self.dependencies = (dependencies or [])
|
||||
self.public_dependencies = (public_dependencies or [])
|
||||
|
||||
if (api_implementation.Type() == 'cpp' and
|
||||
self.serialized_pb is not None):
|
||||
_message.default_pool.AddSerializedFile(self.serialized_pb)
|
||||
|
||||
def CopyToProto(self, proto):
|
||||
"""Copies this to a descriptor_pb2.FileDescriptorProto.
|
||||
|
||||
@@ -1026,9 +1129,11 @@ def MakeDescriptor(desc_proto, package='', build_file_if_cpp=True,
|
||||
for enum_proto in desc_proto.enum_type:
|
||||
full_name = '.'.join(full_message_name + [enum_proto.name])
|
||||
enum_desc = EnumDescriptor(
|
||||
enum_proto.name, full_name, None, [
|
||||
EnumValueDescriptor(enum_val.name, ii, enum_val.number)
|
||||
for ii, enum_val in enumerate(enum_proto.value)])
|
||||
enum_proto.name, full_name, None, [
|
||||
EnumValueDescriptor(enum_val.name, ii, enum_val.number,
|
||||
create_key=_internal_create_key)
|
||||
for ii, enum_val in enumerate(enum_proto.value)],
|
||||
create_key=_internal_create_key)
|
||||
enum_types[full_name] = enum_desc
|
||||
|
||||
# Create Descriptors for nested types
|
||||
@@ -1067,10 +1172,11 @@ def MakeDescriptor(desc_proto, package='', build_file_if_cpp=True,
|
||||
FieldDescriptor.ProtoTypeToCppProtoType(field_proto.type),
|
||||
field_proto.label, None, nested_desc, enum_desc, None, False, None,
|
||||
options=_OptionsOrNone(field_proto), has_default_value=False,
|
||||
json_name=json_name)
|
||||
json_name=json_name, create_key=_internal_create_key)
|
||||
fields.append(field)
|
||||
|
||||
desc_name = '.'.join(full_message_name)
|
||||
return Descriptor(desc_proto.name, desc_name, None, None, fields,
|
||||
list(nested_types.values()), list(enum_types.values()), [],
|
||||
options=_OptionsOrNone(desc_proto))
|
||||
options=_OptionsOrNone(desc_proto),
|
||||
create_key=_internal_create_key)
|
||||
@@ -58,7 +58,7 @@ class DescriptorDatabase(object):
|
||||
Raises:
|
||||
DescriptorDatabaseConflictingDefinitionError: if an attempt is made to
|
||||
add a proto with the same name but different definition than an
|
||||
exisiting proto in the database.
|
||||
existing proto in the database.
|
||||
"""
|
||||
proto_name = file_desc_proto.name
|
||||
if proto_name not in self._file_desc_protos_by_file:
|
||||
@@ -76,6 +76,9 @@ class DescriptorDatabase(object):
|
||||
self._AddSymbol(name, file_desc_proto)
|
||||
for enum in file_desc_proto.enum_type:
|
||||
self._AddSymbol(('.'.join((package, enum.name))), file_desc_proto)
|
||||
for enum_value in enum.value:
|
||||
self._file_desc_protos_by_symbol[
|
||||
'.'.join((package, enum_value.name))] = file_desc_proto
|
||||
for extension in file_desc_proto.extension:
|
||||
self._AddSymbol(('.'.join((package, extension.name))), file_desc_proto)
|
||||
for service in file_desc_proto.service:
|
||||
@@ -131,7 +134,19 @@ class DescriptorDatabase(object):
|
||||
# descriptor can also be found. The behavior is the same with
|
||||
# protobuf C++.
|
||||
top_level, _, _ = symbol.rpartition('.')
|
||||
return self._file_desc_protos_by_symbol[top_level]
|
||||
try:
|
||||
return self._file_desc_protos_by_symbol[top_level]
|
||||
except KeyError:
|
||||
# Raise the original symbol as a KeyError for better diagnostics.
|
||||
raise KeyError(symbol)
|
||||
|
||||
def FindFileContainingExtension(self, extendee_name, extension_number):
|
||||
# TODO(jieluo): implement this API.
|
||||
return None
|
||||
|
||||
def FindAllExtensionNumbers(self, extendee_name):
|
||||
# TODO(jieluo): implement this API.
|
||||
return []
|
||||
|
||||
def _AddSymbol(self, name, file_desc_proto):
|
||||
if name in self._file_desc_protos_by_symbol:
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -38,7 +38,7 @@ For most applications protocol buffers should be used via modules generated by
|
||||
the protocol buffer compiler tool. This should only be used when the type of
|
||||
protocol buffers used in an application or library cannot be predetermined.
|
||||
|
||||
Below is a straightforward example on how to use this class:
|
||||
Below is a straightforward example on how to use this class::
|
||||
|
||||
pool = DescriptorPool()
|
||||
file_descriptor_protos = [ ... ]
|
||||
@@ -68,6 +68,22 @@ from google.protobuf import text_encoding
|
||||
_USE_C_DESCRIPTORS = descriptor._USE_C_DESCRIPTORS # pylint: disable=protected-access
|
||||
|
||||
|
||||
def _Deprecated(func):
|
||||
"""Mark functions as deprecated."""
|
||||
|
||||
def NewFunc(*args, **kwargs):
|
||||
warnings.warn(
|
||||
'Call to deprecated function %s(). Note: Do add unlinked descriptors '
|
||||
'to descriptor_pool is wrong. Use Add() or AddSerializedFile() '
|
||||
'instead.' % func.__name__,
|
||||
category=DeprecationWarning)
|
||||
return func(*args, **kwargs)
|
||||
NewFunc.__name__ = func.__name__
|
||||
NewFunc.__doc__ = func.__doc__
|
||||
NewFunc.__dict__.update(func.__dict__)
|
||||
return NewFunc
|
||||
|
||||
|
||||
def _NormalizeFullyQualifiedName(name):
|
||||
"""Remove leading period from fully-qualified type name.
|
||||
|
||||
@@ -75,10 +91,10 @@ def _NormalizeFullyQualifiedName(name):
|
||||
generated with a leading period. This function removes that prefix.
|
||||
|
||||
Args:
|
||||
name: A str, the fully-qualified symbol name.
|
||||
name (str): The fully-qualified symbol name.
|
||||
|
||||
Returns:
|
||||
A str, the normalized fully-qualified symbol name.
|
||||
str: The normalized fully-qualified symbol name.
|
||||
"""
|
||||
return name.lstrip('.')
|
||||
|
||||
@@ -131,40 +147,56 @@ class DescriptorPool(object):
|
||||
# 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 = {}
|
||||
self._top_enum_values = {}
|
||||
# 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):
|
||||
def _CheckConflictRegister(self, desc, desc_name, file_name):
|
||||
"""Check if the descriptor name conflicts with another of the same name.
|
||||
|
||||
Args:
|
||||
desc: Descriptor of a message, enum, service or extension.
|
||||
desc: Descriptor of a message, enum, service, extension or enum value.
|
||||
desc_name (str): the full name of desc.
|
||||
file_name (str): The file name of descriptor.
|
||||
"""
|
||||
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)]:
|
||||
(self._toplevel_extensions, descriptor.FieldDescriptor),
|
||||
(self._top_enum_values, descriptor.EnumValueDescriptor)]:
|
||||
if desc_name in register:
|
||||
file_name = register[desc_name].file.name
|
||||
old_desc = register[desc_name]
|
||||
if isinstance(old_desc, descriptor.EnumValueDescriptor):
|
||||
old_file = old_desc.type.file.name
|
||||
else:
|
||||
old_file = old_desc.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)
|
||||
old_file != file_name):
|
||||
error_msg = ('Conflict register for file "' + file_name +
|
||||
'": ' + desc_name +
|
||||
' is already defined in file "' +
|
||||
old_file + '". Please fix the conflict by adding '
|
||||
'package name on the proto file, or use different '
|
||||
'name for the duplication.')
|
||||
if isinstance(desc, descriptor.EnumValueDescriptor):
|
||||
error_msg += ('\nNote: enum values appear as '
|
||||
'siblings of the enum type instead of '
|
||||
'children of it.')
|
||||
|
||||
raise TypeError(error_msg)
|
||||
|
||||
return
|
||||
|
||||
def Add(self, file_desc_proto):
|
||||
"""Adds the FileDescriptorProto and its types to this pool.
|
||||
|
||||
Args:
|
||||
file_desc_proto: The FileDescriptorProto to add.
|
||||
file_desc_proto (FileDescriptorProto): The file descriptor to add.
|
||||
"""
|
||||
|
||||
self._internal_db.Add(file_desc_proto)
|
||||
@@ -173,17 +205,29 @@ class DescriptorPool(object):
|
||||
"""Adds the FileDescriptorProto and its types to this pool.
|
||||
|
||||
Args:
|
||||
serialized_file_desc_proto: A bytes string, serialization of the
|
||||
FileDescriptorProto to add.
|
||||
serialized_file_desc_proto (bytes): A bytes string, serialization of the
|
||||
:class:`FileDescriptorProto` to add.
|
||||
|
||||
Returns:
|
||||
FileDescriptor: Descriptor for the added file.
|
||||
"""
|
||||
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf import descriptor_pb2
|
||||
file_desc_proto = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
serialized_file_desc_proto)
|
||||
self.Add(file_desc_proto)
|
||||
file_desc = self._ConvertFileProtoToFileDescriptor(file_desc_proto)
|
||||
file_desc.serialized_pb = serialized_file_desc_proto
|
||||
return file_desc
|
||||
|
||||
# Add Descriptor to descriptor pool is dreprecated. Please use Add()
|
||||
# or AddSerializedFile() to add a FileDescriptorProto instead.
|
||||
@_Deprecated
|
||||
def AddDescriptor(self, desc):
|
||||
self._AddDescriptor(desc)
|
||||
|
||||
# Never call this method. It is for internal usage only.
|
||||
def _AddDescriptor(self, desc):
|
||||
"""Adds a Descriptor to the pool, non-recursively.
|
||||
|
||||
If the Descriptor contains nested messages or enums, the caller must
|
||||
@@ -196,12 +240,19 @@ class DescriptorPool(object):
|
||||
if not isinstance(desc, descriptor.Descriptor):
|
||||
raise TypeError('Expected instance of descriptor.Descriptor.')
|
||||
|
||||
self._CheckConflictRegister(desc)
|
||||
self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
|
||||
|
||||
self._descriptors[desc.full_name] = desc
|
||||
self._AddFileDescriptor(desc.file)
|
||||
|
||||
# Add EnumDescriptor to descriptor pool is dreprecated. Please use Add()
|
||||
# or AddSerializedFile() to add a FileDescriptorProto instead.
|
||||
@_Deprecated
|
||||
def AddEnumDescriptor(self, enum_desc):
|
||||
self._AddEnumDescriptor(enum_desc)
|
||||
|
||||
# Never call this method. It is for internal usage only.
|
||||
def _AddEnumDescriptor(self, enum_desc):
|
||||
"""Adds an EnumDescriptor to the pool.
|
||||
|
||||
This method also registers the FileDescriptor associated with the enum.
|
||||
@@ -213,11 +264,36 @@ class DescriptorPool(object):
|
||||
if not isinstance(enum_desc, descriptor.EnumDescriptor):
|
||||
raise TypeError('Expected instance of descriptor.EnumDescriptor.')
|
||||
|
||||
self._CheckConflictRegister(enum_desc)
|
||||
file_name = enum_desc.file.name
|
||||
self._CheckConflictRegister(enum_desc, enum_desc.full_name, file_name)
|
||||
self._enum_descriptors[enum_desc.full_name] = enum_desc
|
||||
|
||||
# Top enum values need to be indexed.
|
||||
# Count the number of dots to see whether the enum is toplevel or nested
|
||||
# in a message. We cannot use enum_desc.containing_type at this stage.
|
||||
if enum_desc.file.package:
|
||||
top_level = (enum_desc.full_name.count('.')
|
||||
- enum_desc.file.package.count('.') == 1)
|
||||
else:
|
||||
top_level = enum_desc.full_name.count('.') == 0
|
||||
if top_level:
|
||||
file_name = enum_desc.file.name
|
||||
package = enum_desc.file.package
|
||||
for enum_value in enum_desc.values:
|
||||
full_name = _NormalizeFullyQualifiedName(
|
||||
'.'.join((package, enum_value.name)))
|
||||
self._CheckConflictRegister(enum_value, full_name, file_name)
|
||||
self._top_enum_values[full_name] = enum_value
|
||||
self._AddFileDescriptor(enum_desc.file)
|
||||
|
||||
# Add ServiceDescriptor to descriptor pool is dreprecated. Please use Add()
|
||||
# or AddSerializedFile() to add a FileDescriptorProto instead.
|
||||
@_Deprecated
|
||||
def AddServiceDescriptor(self, service_desc):
|
||||
self._AddServiceDescriptor(service_desc)
|
||||
|
||||
# Never call this method. It is for internal usage only.
|
||||
def _AddServiceDescriptor(self, service_desc):
|
||||
"""Adds a ServiceDescriptor to the pool.
|
||||
|
||||
Args:
|
||||
@@ -227,10 +303,18 @@ class DescriptorPool(object):
|
||||
if not isinstance(service_desc, descriptor.ServiceDescriptor):
|
||||
raise TypeError('Expected instance of descriptor.ServiceDescriptor.')
|
||||
|
||||
self._CheckConflictRegister(service_desc)
|
||||
self._CheckConflictRegister(service_desc, service_desc.full_name,
|
||||
service_desc.file.name)
|
||||
self._service_descriptors[service_desc.full_name] = service_desc
|
||||
|
||||
# Add ExtensionDescriptor to descriptor pool is dreprecated. Please use Add()
|
||||
# or AddSerializedFile() to add a FileDescriptorProto instead.
|
||||
@_Deprecated
|
||||
def AddExtensionDescriptor(self, extension):
|
||||
self._AddExtensionDescriptor(extension)
|
||||
|
||||
# Never call this method. It is for internal usage only.
|
||||
def _AddExtensionDescriptor(self, extension):
|
||||
"""Adds a FieldDescriptor describing an extension to the pool.
|
||||
|
||||
Args:
|
||||
@@ -247,7 +331,6 @@ 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:
|
||||
@@ -273,7 +356,12 @@ class DescriptorPool(object):
|
||||
self._extensions_by_name[extension.containing_type][
|
||||
extension.message_type.full_name] = extension
|
||||
|
||||
@_Deprecated
|
||||
def AddFileDescriptor(self, file_desc):
|
||||
self._InternalAddFileDescriptor(file_desc)
|
||||
|
||||
# Never call this method. It is for internal usage only.
|
||||
def _InternalAddFileDescriptor(self, file_desc):
|
||||
"""Adds a FileDescriptor to the pool, non-recursively.
|
||||
|
||||
If the FileDescriptor contains messages or enums, the caller must explicitly
|
||||
@@ -309,10 +397,10 @@ class DescriptorPool(object):
|
||||
"""Gets a FileDescriptor by file name.
|
||||
|
||||
Args:
|
||||
file_name: The path to the file to get a descriptor for.
|
||||
file_name (str): The path to the file to get a descriptor for.
|
||||
|
||||
Returns:
|
||||
A FileDescriptor for the named file.
|
||||
FileDescriptor: The descriptor for the named file.
|
||||
|
||||
Raises:
|
||||
KeyError: if the file cannot be found in the pool.
|
||||
@@ -338,16 +426,42 @@ class DescriptorPool(object):
|
||||
"""Gets the FileDescriptor for the file containing the specified symbol.
|
||||
|
||||
Args:
|
||||
symbol: The name of the symbol to search for.
|
||||
symbol (str): The name of the symbol to search for.
|
||||
|
||||
Returns:
|
||||
A FileDescriptor that contains the specified symbol.
|
||||
FileDescriptor: Descriptor for the file that contains the specified
|
||||
symbol.
|
||||
|
||||
Raises:
|
||||
KeyError: if the file cannot be found in the pool.
|
||||
"""
|
||||
|
||||
symbol = _NormalizeFullyQualifiedName(symbol)
|
||||
try:
|
||||
return self._InternalFindFileContainingSymbol(symbol)
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
try:
|
||||
# Try fallback database. Build and find again if possible.
|
||||
self._FindFileContainingSymbolInDb(symbol)
|
||||
return self._InternalFindFileContainingSymbol(symbol)
|
||||
except KeyError:
|
||||
raise KeyError('Cannot find a file containing %s' % symbol)
|
||||
|
||||
def _InternalFindFileContainingSymbol(self, symbol):
|
||||
"""Gets the already built FileDescriptor containing the specified symbol.
|
||||
|
||||
Args:
|
||||
symbol (str): The name of the symbol to search for.
|
||||
|
||||
Returns:
|
||||
FileDescriptor: Descriptor for the file that contains the specified
|
||||
symbol.
|
||||
|
||||
Raises:
|
||||
KeyError: if the file cannot be found in the pool.
|
||||
"""
|
||||
try:
|
||||
return self._descriptors[symbol].file
|
||||
except KeyError:
|
||||
@@ -364,7 +478,7 @@ class DescriptorPool(object):
|
||||
pass
|
||||
|
||||
try:
|
||||
return self._FindFileContainingSymbolInDb(symbol)
|
||||
return self._top_enum_values[symbol].type.file
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
@@ -373,23 +487,25 @@ class DescriptorPool(object):
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
# Try nested extensions inside a message.
|
||||
message_name, _, extension_name = symbol.rpartition('.')
|
||||
# Try fields, enum values and nested extensions inside a message.
|
||||
top_name, _, sub_name = symbol.rpartition('.')
|
||||
try:
|
||||
message = self.FindMessageTypeByName(message_name)
|
||||
assert message.extensions_by_name[extension_name]
|
||||
message = self.FindMessageTypeByName(top_name)
|
||||
assert (sub_name in message.extensions_by_name or
|
||||
sub_name in message.fields_by_name or
|
||||
sub_name in message.enum_values_by_name)
|
||||
return message.file
|
||||
except KeyError:
|
||||
except (KeyError, AssertionError):
|
||||
raise KeyError('Cannot find a file containing %s' % symbol)
|
||||
|
||||
def FindMessageTypeByName(self, full_name):
|
||||
"""Loads the named descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the descriptor to load.
|
||||
full_name (str): The full name of the descriptor to load.
|
||||
|
||||
Returns:
|
||||
The descriptor for the named type.
|
||||
Descriptor: The descriptor for the named type.
|
||||
|
||||
Raises:
|
||||
KeyError: if the message cannot be found in the pool.
|
||||
@@ -404,10 +520,10 @@ class DescriptorPool(object):
|
||||
"""Loads the named enum descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the enum descriptor to load.
|
||||
full_name (str): The full name of the enum descriptor to load.
|
||||
|
||||
Returns:
|
||||
The enum descriptor for the named type.
|
||||
EnumDescriptor: The enum descriptor for the named type.
|
||||
|
||||
Raises:
|
||||
KeyError: if the enum cannot be found in the pool.
|
||||
@@ -422,10 +538,10 @@ class DescriptorPool(object):
|
||||
"""Loads the named field descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the field descriptor to load.
|
||||
full_name (str): The full name of the field descriptor to load.
|
||||
|
||||
Returns:
|
||||
The field descriptor for the named field.
|
||||
FieldDescriptor: The field descriptor for the named field.
|
||||
|
||||
Raises:
|
||||
KeyError: if the field cannot be found in the pool.
|
||||
@@ -439,10 +555,10 @@ class DescriptorPool(object):
|
||||
"""Loads the named oneof descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the oneof descriptor to load.
|
||||
full_name (str): The full name of the oneof descriptor to load.
|
||||
|
||||
Returns:
|
||||
The oneof descriptor for the named oneof.
|
||||
OneofDescriptor: The oneof descriptor for the named oneof.
|
||||
|
||||
Raises:
|
||||
KeyError: if the oneof cannot be found in the pool.
|
||||
@@ -456,10 +572,10 @@ class DescriptorPool(object):
|
||||
"""Loads the named extension descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the extension descriptor to load.
|
||||
full_name (str): The full name of the extension descriptor to load.
|
||||
|
||||
Returns:
|
||||
A FieldDescriptor, describing the named extension.
|
||||
FieldDescriptor: The field descriptor for the named extension.
|
||||
|
||||
Raises:
|
||||
KeyError: if the extension cannot be found in the pool.
|
||||
@@ -485,44 +601,86 @@ class DescriptorPool(object):
|
||||
def FindExtensionByNumber(self, message_descriptor, number):
|
||||
"""Gets the extension of the specified message with the specified number.
|
||||
|
||||
Extensions have to be registered to this pool by calling
|
||||
AddExtensionDescriptor.
|
||||
Extensions have to be registered to this pool by calling :func:`Add` or
|
||||
:func:`AddExtensionDescriptor`.
|
||||
|
||||
Args:
|
||||
message_descriptor: descriptor of the extended message.
|
||||
number: integer, number of the extension field.
|
||||
message_descriptor (Descriptor): descriptor of the extended message.
|
||||
number (int): Number of the extension field.
|
||||
|
||||
Returns:
|
||||
A FieldDescriptor describing the extension.
|
||||
FieldDescriptor: The descriptor for the extension.
|
||||
|
||||
Raises:
|
||||
KeyError: when no extension with the given number is known for the
|
||||
specified message.
|
||||
"""
|
||||
return self._extensions_by_number[message_descriptor][number]
|
||||
try:
|
||||
return self._extensions_by_number[message_descriptor][number]
|
||||
except KeyError:
|
||||
self._TryLoadExtensionFromDB(message_descriptor, number)
|
||||
return self._extensions_by_number[message_descriptor][number]
|
||||
|
||||
def FindAllExtensions(self, message_descriptor):
|
||||
"""Gets all the known extension of a given message.
|
||||
"""Gets all the known extensions of a given message.
|
||||
|
||||
Extensions have to be registered to this pool by calling
|
||||
AddExtensionDescriptor.
|
||||
Extensions have to be registered to this pool by build related
|
||||
:func:`Add` or :func:`AddExtensionDescriptor`.
|
||||
|
||||
Args:
|
||||
message_descriptor (Descriptor): Descriptor of the extended message.
|
||||
|
||||
Returns:
|
||||
list[FieldDescriptor]: Field descriptors describing the extensions.
|
||||
"""
|
||||
# Fallback to descriptor db if FindAllExtensionNumbers is provided.
|
||||
if self._descriptor_db and hasattr(
|
||||
self._descriptor_db, 'FindAllExtensionNumbers'):
|
||||
full_name = message_descriptor.full_name
|
||||
all_numbers = self._descriptor_db.FindAllExtensionNumbers(full_name)
|
||||
for number in all_numbers:
|
||||
if number in self._extensions_by_number[message_descriptor]:
|
||||
continue
|
||||
self._TryLoadExtensionFromDB(message_descriptor, number)
|
||||
|
||||
return list(self._extensions_by_number[message_descriptor].values())
|
||||
|
||||
def _TryLoadExtensionFromDB(self, message_descriptor, number):
|
||||
"""Try to Load extensions from descriptor db.
|
||||
|
||||
Args:
|
||||
message_descriptor: descriptor of the extended message.
|
||||
|
||||
Returns:
|
||||
A list of FieldDescriptor describing the extensions.
|
||||
number: the extension number that needs to be loaded.
|
||||
"""
|
||||
return list(self._extensions_by_number[message_descriptor].values())
|
||||
if not self._descriptor_db:
|
||||
return
|
||||
# Only supported when FindFileContainingExtension is provided.
|
||||
if not hasattr(
|
||||
self._descriptor_db, 'FindFileContainingExtension'):
|
||||
return
|
||||
|
||||
full_name = message_descriptor.full_name
|
||||
file_proto = self._descriptor_db.FindFileContainingExtension(
|
||||
full_name, number)
|
||||
|
||||
if file_proto is None:
|
||||
return
|
||||
|
||||
try:
|
||||
self._ConvertFileProtoToFileDescriptor(file_proto)
|
||||
except:
|
||||
warn_msg = ('Unable to load proto file %s for extension number %d.' %
|
||||
(file_proto.name, number))
|
||||
warnings.warn(warn_msg, RuntimeWarning)
|
||||
|
||||
def FindServiceByName(self, full_name):
|
||||
"""Loads the named service descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name: The full name of the service descriptor to load.
|
||||
full_name (str): The full name of the service descriptor to load.
|
||||
|
||||
Returns:
|
||||
The service descriptor for the named service.
|
||||
ServiceDescriptor: The service descriptor for the named service.
|
||||
|
||||
Raises:
|
||||
KeyError: if the service cannot be found in the pool.
|
||||
@@ -532,14 +690,31 @@ class DescriptorPool(object):
|
||||
self._FindFileContainingSymbolInDb(full_name)
|
||||
return self._service_descriptors[full_name]
|
||||
|
||||
def FindMethodByName(self, full_name):
|
||||
"""Loads the named service method descriptor from the pool.
|
||||
|
||||
Args:
|
||||
full_name (str): The full name of the method descriptor to load.
|
||||
|
||||
Returns:
|
||||
MethodDescriptor: The method descriptor for the service method.
|
||||
|
||||
Raises:
|
||||
KeyError: if the method cannot be found in the pool.
|
||||
"""
|
||||
full_name = _NormalizeFullyQualifiedName(full_name)
|
||||
service_name, _, method_name = full_name.rpartition('.')
|
||||
service_descriptor = self.FindServiceByName(service_name)
|
||||
return service_descriptor.methods_by_name[method_name]
|
||||
|
||||
def _FindFileContainingSymbolInDb(self, symbol):
|
||||
"""Finds the file in descriptor DB containing the specified symbol.
|
||||
|
||||
Args:
|
||||
symbol: The name of the symbol to search for.
|
||||
symbol (str): The name of the symbol to search for.
|
||||
|
||||
Returns:
|
||||
A FileDescriptor that contains the specified symbol.
|
||||
FileDescriptor: The file that contains the specified symbol.
|
||||
|
||||
Raises:
|
||||
KeyError: if the file cannot be found in the descriptor database.
|
||||
@@ -567,7 +742,6 @@ class DescriptorPool(object):
|
||||
Returns:
|
||||
A FileDescriptor matching the passed in proto.
|
||||
"""
|
||||
|
||||
if file_proto.name not in self._file_descriptors:
|
||||
built_deps = list(self._GetDeps(file_proto.dependency))
|
||||
direct_deps = [self.FindFileByName(n) for n in file_proto.dependency]
|
||||
@@ -581,7 +755,9 @@ class DescriptorPool(object):
|
||||
options=_OptionsOrNone(file_proto),
|
||||
serialized_pb=file_proto.SerializeToString(),
|
||||
dependencies=direct_deps,
|
||||
public_dependencies=public_deps)
|
||||
public_dependencies=public_deps,
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
scope = {}
|
||||
|
||||
# This loop extracts all the message and enum types from all the
|
||||
@@ -604,7 +780,7 @@ class DescriptorPool(object):
|
||||
for enum_type in file_proto.enum_type:
|
||||
file_descriptor.enum_types_by_name[enum_type.name] = (
|
||||
self._ConvertEnumDescriptor(enum_type, file_proto.package,
|
||||
file_descriptor, None, scope))
|
||||
file_descriptor, None, scope, True))
|
||||
|
||||
for index, extension_proto in enumerate(file_proto.extension):
|
||||
extension_desc = self._MakeFieldDescriptor(
|
||||
@@ -616,6 +792,8 @@ class DescriptorPool(object):
|
||||
file_descriptor.package, scope)
|
||||
file_descriptor.extensions_by_name[extension_desc.name] = (
|
||||
extension_desc)
|
||||
self._file_desc_by_toplevel_extension[extension_desc.full_name] = (
|
||||
file_descriptor)
|
||||
|
||||
for desc_proto in file_proto.message_type:
|
||||
self._SetAllFieldTypes(file_proto.package, desc_proto, scope)
|
||||
@@ -635,10 +813,17 @@ class DescriptorPool(object):
|
||||
self._MakeServiceDescriptor(service_proto, index, scope,
|
||||
file_proto.package, file_descriptor))
|
||||
|
||||
self.Add(file_proto)
|
||||
self._file_descriptors[file_proto.name] = file_descriptor
|
||||
|
||||
return self._file_descriptors[file_proto.name]
|
||||
# Add extensions to the pool
|
||||
file_desc = self._file_descriptors[file_proto.name]
|
||||
for extension in file_desc.extensions_by_name.values():
|
||||
self._AddExtensionDescriptor(extension)
|
||||
for message_type in file_desc.message_types_by_name.values():
|
||||
for extension in message_type.extensions:
|
||||
self._AddExtensionDescriptor(extension)
|
||||
|
||||
return file_desc
|
||||
|
||||
def _ConvertMessageDescriptor(self, desc_proto, package=None, file_desc=None,
|
||||
scope=None, syntax=None):
|
||||
@@ -673,7 +858,8 @@ class DescriptorPool(object):
|
||||
nested, desc_name, file_desc, scope, syntax)
|
||||
for nested in desc_proto.nested_type]
|
||||
enums = [
|
||||
self._ConvertEnumDescriptor(enum, desc_name, file_desc, None, scope)
|
||||
self._ConvertEnumDescriptor(enum, desc_name, file_desc, None,
|
||||
scope, False)
|
||||
for enum in desc_proto.enum_type]
|
||||
fields = [self._MakeFieldDescriptor(field, desc_name, index, file_desc)
|
||||
for index, field in enumerate(desc_proto.field)]
|
||||
@@ -682,9 +868,18 @@ class DescriptorPool(object):
|
||||
is_extension=True)
|
||||
for index, extension in enumerate(desc_proto.extension)]
|
||||
oneofs = [
|
||||
descriptor.OneofDescriptor(desc.name, '.'.join((desc_name, desc.name)),
|
||||
index, None, [], desc.options)
|
||||
for index, desc in enumerate(desc_proto.oneof_decl)]
|
||||
# pylint: disable=g-complex-comprehension
|
||||
descriptor.OneofDescriptor(
|
||||
desc.name,
|
||||
'.'.join((desc_name, desc.name)),
|
||||
index,
|
||||
None,
|
||||
[],
|
||||
_OptionsOrNone(desc),
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
for index, desc in enumerate(desc_proto.oneof_decl)
|
||||
]
|
||||
extension_ranges = [(r.start, r.end) for r in desc_proto.extension_range]
|
||||
if extension_ranges:
|
||||
is_extendable = True
|
||||
@@ -706,7 +901,9 @@ class DescriptorPool(object):
|
||||
file=file_desc,
|
||||
serialized_start=None,
|
||||
serialized_end=None,
|
||||
syntax=syntax)
|
||||
syntax=syntax,
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
for nested in desc.nested_types:
|
||||
nested.containing_type = desc
|
||||
for enum in desc.enum_types:
|
||||
@@ -718,12 +915,12 @@ class DescriptorPool(object):
|
||||
fields[field_index].containing_oneof = oneofs[oneof_index]
|
||||
|
||||
scope[_PrefixWithDot(desc_name)] = desc
|
||||
self._CheckConflictRegister(desc)
|
||||
self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
|
||||
self._descriptors[desc_name] = desc
|
||||
return desc
|
||||
|
||||
def _ConvertEnumDescriptor(self, enum_proto, package=None, file_desc=None,
|
||||
containing_type=None, scope=None):
|
||||
containing_type=None, scope=None, top_level=False):
|
||||
"""Make a protobuf EnumDescriptor given an EnumDescriptorProto protobuf.
|
||||
|
||||
Args:
|
||||
@@ -732,6 +929,8 @@ class DescriptorPool(object):
|
||||
file_desc: The file containing the enum descriptor.
|
||||
containing_type: The type containing this enum.
|
||||
scope: Scope containing available types.
|
||||
top_level: If True, the enum is a top level symbol. If False, the enum
|
||||
is defined inside a message.
|
||||
|
||||
Returns:
|
||||
The added descriptor
|
||||
@@ -755,10 +954,21 @@ class DescriptorPool(object):
|
||||
file=file_desc,
|
||||
values=values,
|
||||
containing_type=containing_type,
|
||||
options=_OptionsOrNone(enum_proto))
|
||||
options=_OptionsOrNone(enum_proto),
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
scope['.%s' % enum_name] = desc
|
||||
self._CheckConflictRegister(desc)
|
||||
self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
|
||||
self._enum_descriptors[enum_name] = desc
|
||||
|
||||
# Add top level enum values.
|
||||
if top_level:
|
||||
for value in values:
|
||||
full_name = _NormalizeFullyQualifiedName(
|
||||
'.'.join((package, value.name)))
|
||||
self._CheckConflictRegister(value, full_name, file_name)
|
||||
self._top_enum_values[full_name] = value
|
||||
|
||||
return desc
|
||||
|
||||
def _MakeFieldDescriptor(self, field_proto, message_name, index,
|
||||
@@ -787,6 +997,11 @@ class DescriptorPool(object):
|
||||
else:
|
||||
full_name = field_proto.name
|
||||
|
||||
if field_proto.json_name:
|
||||
json_name = field_proto.json_name
|
||||
else:
|
||||
json_name = None
|
||||
|
||||
return descriptor.FieldDescriptor(
|
||||
name=field_proto.name,
|
||||
full_name=full_name,
|
||||
@@ -803,7 +1018,10 @@ class DescriptorPool(object):
|
||||
is_extension=is_extension,
|
||||
extension_scope=None,
|
||||
options=_OptionsOrNone(field_proto),
|
||||
file=file_desc)
|
||||
json_name=json_name,
|
||||
file=file_desc,
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
|
||||
def _SetAllFieldTypes(self, package, desc_proto, scope):
|
||||
"""Sets all the descriptor's fields's types.
|
||||
@@ -842,7 +1060,7 @@ class DescriptorPool(object):
|
||||
|
||||
Args:
|
||||
field_proto: Data about the field in proto format.
|
||||
field_desc: The descriptor to modiy.
|
||||
field_desc: The descriptor to modify.
|
||||
package: The package the field's container is in.
|
||||
scope: Enclosing scope of available types.
|
||||
"""
|
||||
@@ -885,6 +1103,8 @@ class DescriptorPool(object):
|
||||
elif field_proto.type == descriptor.FieldDescriptor.TYPE_BYTES:
|
||||
field_desc.default_value = text_encoding.CUnescape(
|
||||
field_proto.default_value)
|
||||
elif field_proto.type == descriptor.FieldDescriptor.TYPE_MESSAGE:
|
||||
field_desc.default_value = None
|
||||
else:
|
||||
# All other types are of the "int" type.
|
||||
field_desc.default_value = int(field_proto.default_value)
|
||||
@@ -901,6 +1121,10 @@ class DescriptorPool(object):
|
||||
field_desc.default_value = field_desc.enum_type.values[0].number
|
||||
elif field_proto.type == descriptor.FieldDescriptor.TYPE_BYTES:
|
||||
field_desc.default_value = b''
|
||||
elif field_proto.type == descriptor.FieldDescriptor.TYPE_MESSAGE:
|
||||
field_desc.default_value = None
|
||||
elif field_proto.type == descriptor.FieldDescriptor.TYPE_GROUP:
|
||||
field_desc.default_value = None
|
||||
else:
|
||||
# All other types are of the "int" type.
|
||||
field_desc.default_value = 0
|
||||
@@ -923,7 +1147,9 @@ class DescriptorPool(object):
|
||||
index=index,
|
||||
number=value_proto.number,
|
||||
options=_OptionsOrNone(value_proto),
|
||||
type=None)
|
||||
type=None,
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
|
||||
def _MakeServiceDescriptor(self, service_proto, service_index, scope,
|
||||
package, file_desc):
|
||||
@@ -948,13 +1174,16 @@ class DescriptorPool(object):
|
||||
methods = [self._MakeMethodDescriptor(method_proto, service_name, package,
|
||||
scope, index)
|
||||
for index, method_proto in enumerate(service_proto.method)]
|
||||
desc = descriptor.ServiceDescriptor(name=service_proto.name,
|
||||
full_name=service_name,
|
||||
index=service_index,
|
||||
methods=methods,
|
||||
options=_OptionsOrNone(service_proto),
|
||||
file=file_desc)
|
||||
self._CheckConflictRegister(desc)
|
||||
desc = descriptor.ServiceDescriptor(
|
||||
name=service_proto.name,
|
||||
full_name=service_name,
|
||||
index=service_index,
|
||||
methods=methods,
|
||||
options=_OptionsOrNone(service_proto),
|
||||
file=file_desc,
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
|
||||
self._service_descriptors[service_name] = desc
|
||||
return desc
|
||||
|
||||
@@ -977,13 +1206,16 @@ class DescriptorPool(object):
|
||||
package, method_proto.input_type, scope)
|
||||
output_type = self._GetTypeFromScope(
|
||||
package, method_proto.output_type, scope)
|
||||
return descriptor.MethodDescriptor(name=method_proto.name,
|
||||
full_name=full_name,
|
||||
index=index,
|
||||
containing_service=None,
|
||||
input_type=input_type,
|
||||
output_type=output_type,
|
||||
options=_OptionsOrNone(method_proto))
|
||||
return descriptor.MethodDescriptor(
|
||||
name=method_proto.name,
|
||||
full_name=full_name,
|
||||
index=index,
|
||||
containing_service=None,
|
||||
input_type=input_type,
|
||||
output_type=output_type,
|
||||
options=_OptionsOrNone(method_proto),
|
||||
# pylint: disable=protected-access
|
||||
create_key=descriptor._internal_create_key)
|
||||
|
||||
def _ExtractSymbols(self, descriptors):
|
||||
"""Pulls out all the symbols from descriptor protos.
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/duration.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,64 +14,22 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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\x83\x01\n\x13\x63om.google.protobufB\rDurationProtoP\x01Z1google.golang.org/protobuf/types/known/durationpb\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
|
||||
|
||||
|
||||
|
||||
_DURATION = _descriptor.Descriptor(
|
||||
name='Duration',
|
||||
full_name='google.protobuf.Duration',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='seconds', full_name='google.protobuf.Duration.seconds', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=51,
|
||||
serialized_end=93,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['Duration'] = _DURATION
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Duration = _reflection.GeneratedProtocolMessageType('Duration', (_message.Message,), dict(
|
||||
DESCRIPTOR = _DURATION,
|
||||
__module__ = 'google.protobuf.duration_pb2'
|
||||
_DURATION = DESCRIPTOR.message_types_by_name['Duration']
|
||||
Duration = _reflection.GeneratedProtocolMessageType('Duration', (_message.Message,), {
|
||||
'DESCRIPTOR' : _DURATION,
|
||||
'__module__' : 'google.protobuf.duration_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.Duration)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Duration)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\rDurationProtoP\001Z1google.golang.org/protobuf/types/known/durationpb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'
|
||||
_DURATION._serialized_start=51
|
||||
_DURATION._serialized_end=93
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/empty.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,50 +14,22 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bgoogle/protobuf/empty.proto\x12\x0fgoogle.protobuf\"\x07\n\x05\x45mptyB}\n\x13\x63om.google.protobufB\nEmptyProtoP\x01Z.google.golang.org/protobuf/types/known/emptypb\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
|
||||
|
||||
|
||||
|
||||
_EMPTY = _descriptor.Descriptor(
|
||||
name='Empty',
|
||||
full_name='google.protobuf.Empty',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=48,
|
||||
serialized_end=55,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['Empty'] = _EMPTY
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Empty = _reflection.GeneratedProtocolMessageType('Empty', (_message.Message,), dict(
|
||||
DESCRIPTOR = _EMPTY,
|
||||
__module__ = 'google.protobuf.empty_pb2'
|
||||
_EMPTY = DESCRIPTOR.message_types_by_name['Empty']
|
||||
Empty = _reflection.GeneratedProtocolMessageType('Empty', (_message.Message,), {
|
||||
'DESCRIPTOR' : _EMPTY,
|
||||
'__module__' : 'google.protobuf.empty_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.Empty)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Empty)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\nEmptyProtoP\001Z.google.golang.org/protobuf/types/known/emptypb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'
|
||||
_EMPTY._serialized_start=48
|
||||
_EMPTY._serialized_end=55
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/field_mask.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,57 +14,22 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n google/protobuf/field_mask.proto\x12\x0fgoogle.protobuf\"\x1a\n\tFieldMask\x12\r\n\x05paths\x18\x01 \x03(\tB\x85\x01\n\x13\x63om.google.protobufB\x0e\x46ieldMaskProtoP\x01Z2google.golang.org/protobuf/types/known/fieldmaskpb\xf8\x01\x01\xa2\x02\x03GPB\xaa\x02\x1eGoogle.Protobuf.WellKnownTypesb\x06proto3')
|
||||
|
||||
|
||||
|
||||
|
||||
_FIELDMASK = _descriptor.Descriptor(
|
||||
name='FieldMask',
|
||||
full_name='google.protobuf.FieldMask',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='paths', full_name='google.protobuf.FieldMask.paths', index=0,
|
||||
number=1, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=53,
|
||||
serialized_end=79,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['FieldMask'] = _FIELDMASK
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
FieldMask = _reflection.GeneratedProtocolMessageType('FieldMask', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FIELDMASK,
|
||||
__module__ = 'google.protobuf.field_mask_pb2'
|
||||
_FIELDMASK = DESCRIPTOR.message_types_by_name['FieldMask']
|
||||
FieldMask = _reflection.GeneratedProtocolMessageType('FieldMask', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FIELDMASK,
|
||||
'__module__' : 'google.protobuf.field_mask_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.FieldMask)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(FieldMask)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\016FieldMaskProtoP\001Z2google.golang.org/protobuf/types/known/fieldmaskpb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes'
|
||||
_FIELDMASK._serialized_start=53
|
||||
_FIELDMASK._serialized_end=79
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Executable → Regular
File mode changed.
@@ -51,7 +51,7 @@ like a normal test method, with its own setUp/tearDown cycle. In the
|
||||
example above, there are three separate testcases, one of which will
|
||||
fail due to an assertion error (1 + 1 != 3).
|
||||
|
||||
Parameters for invididual test cases can be tuples (with positional parameters)
|
||||
Parameters for individual test cases can be tuples (with positional parameters)
|
||||
or dictionaries (with named parameters):
|
||||
|
||||
class AdditionExample(parameterized.TestCase):
|
||||
@@ -145,7 +145,6 @@ be wrapped into a tuple:
|
||||
|
||||
__author__ = 'tmarek@google.com (Torsten Marek)'
|
||||
|
||||
import collections
|
||||
import functools
|
||||
import re
|
||||
import types
|
||||
@@ -155,7 +154,12 @@ except ImportError:
|
||||
import unittest
|
||||
import uuid
|
||||
|
||||
import six
|
||||
try:
|
||||
# Since python 3
|
||||
import collections.abc as collections_abc
|
||||
except ImportError:
|
||||
# Won't work after python 3.8
|
||||
import collections as collections_abc
|
||||
|
||||
ADDR_RE = re.compile(r'\<([a-zA-Z0-9_\-\.]+) object at 0x[a-fA-F0-9]+\>')
|
||||
_SEPARATOR = uuid.uuid1().hex
|
||||
@@ -174,12 +178,12 @@ def _StrClass(cls):
|
||||
|
||||
|
||||
def _NonStringIterable(obj):
|
||||
return (isinstance(obj, collections.Iterable) and not
|
||||
isinstance(obj, six.string_types))
|
||||
return (isinstance(obj, collections_abc.Iterable) and
|
||||
not isinstance(obj, str))
|
||||
|
||||
|
||||
def _FormatParameterList(testcase_params):
|
||||
if isinstance(testcase_params, collections.Mapping):
|
||||
if isinstance(testcase_params, collections_abc.Mapping):
|
||||
return ', '.join('%s=%s' % (argname, _CleanRepr(value))
|
||||
for argname, value in testcase_params.items())
|
||||
elif _NonStringIterable(testcase_params):
|
||||
@@ -222,7 +226,7 @@ class _ParameterizedTestIter(object):
|
||||
def MakeBoundParamTest(testcase_params):
|
||||
@functools.wraps(test_method)
|
||||
def BoundParamTest(self):
|
||||
if isinstance(testcase_params, collections.Mapping):
|
||||
if isinstance(testcase_params, collections_abc.Mapping):
|
||||
test_method(self, **testcase_params)
|
||||
elif _NonStringIterable(testcase_params):
|
||||
test_method(self, *testcase_params)
|
||||
@@ -263,7 +267,7 @@ def _ModifyClass(class_object, testcases, naming_type):
|
||||
'Cannot add parameters to %s,'
|
||||
' which already has parameterized methods.' % (class_object,))
|
||||
class_object._id_suffix = id_suffix = {}
|
||||
# We change the size of __dict__ while we iterate over it,
|
||||
# We change the size of __dict__ while we iterate over it,
|
||||
# which Python 3.x will complain about, so use copy().
|
||||
for name, obj in class_object.__dict__.copy().items():
|
||||
if (name.startswith(unittest.TestLoader.testMethodPrefix)
|
||||
@@ -291,7 +295,7 @@ def _ParameterDecorator(naming_type, testcases):
|
||||
if isinstance(obj, type):
|
||||
_ModifyClass(
|
||||
obj,
|
||||
list(testcases) if not isinstance(testcases, collections.Sequence)
|
||||
list(testcases) if not isinstance(testcases, collections_abc.Sequence)
|
||||
else testcases,
|
||||
naming_type)
|
||||
return obj
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/any_test.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,168 +15,45 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
_TESTANY = DESCRIPTOR.message_types_by_name['TestAny']
|
||||
_TESTANY_MAPVALUEENTRY = _TESTANY.nested_types_by_name['MapValueEntry']
|
||||
_TESTANYEXTENSION1 = DESCRIPTOR.message_types_by_name['TestAnyExtension1']
|
||||
TestAny = _reflection.GeneratedProtocolMessageType('TestAny', (_message.Message,), {
|
||||
|
||||
_TESTANY_MAPVALUEENTRY = _descriptor.Descriptor(
|
||||
name='MapValueEntry',
|
||||
full_name='google.protobuf.internal.TestAny.MapValueEntry',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='key', full_name='google.protobuf.internal.TestAny.MapValueEntry.key', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=_b('8\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=232,
|
||||
serialized_end=279,
|
||||
)
|
||||
|
||||
_TESTANY = _descriptor.Descriptor(
|
||||
name='TestAny',
|
||||
full_name='google.protobuf.internal.TestAny',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.internal.TestAny.value', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTANY_MAPVALUEENTRY, ],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(10, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=97,
|
||||
serialized_end=289,
|
||||
)
|
||||
|
||||
|
||||
_TESTANYEXTENSION1 = _descriptor.Descriptor(
|
||||
name='TestAnyExtension1',
|
||||
full_name='google.protobuf.internal.TestAnyExtension1',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='i', full_name='google.protobuf.internal.TestAnyExtension1.i', index=0,
|
||||
number=15, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='extension1', full_name='google.protobuf.internal.TestAnyExtension1.extension1', index=0,
|
||||
number=98418603, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=292,
|
||||
serialized_end=425,
|
||||
)
|
||||
|
||||
_TESTANY_MAPVALUEENTRY.containing_type = _TESTANY
|
||||
_TESTANY.fields_by_name['value'].message_type = google_dot_protobuf_dot_any__pb2._ANY
|
||||
_TESTANY.fields_by_name['map_value'].message_type = _TESTANY_MAPVALUEENTRY
|
||||
DESCRIPTOR.message_types_by_name['TestAny'] = _TESTANY
|
||||
DESCRIPTOR.message_types_by_name['TestAnyExtension1'] = _TESTANYEXTENSION1
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestAny = _reflection.GeneratedProtocolMessageType('TestAny', (_message.Message,), dict(
|
||||
|
||||
MapValueEntry = _reflection.GeneratedProtocolMessageType('MapValueEntry', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTANY_MAPVALUEENTRY,
|
||||
__module__ = 'google.protobuf.internal.any_test_pb2'
|
||||
'MapValueEntry' : _reflection.GeneratedProtocolMessageType('MapValueEntry', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTANY_MAPVALUEENTRY,
|
||||
'__module__' : 'google.protobuf.internal.any_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestAny.MapValueEntry)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _TESTANY,
|
||||
__module__ = 'google.protobuf.internal.any_test_pb2'
|
||||
'DESCRIPTOR' : _TESTANY,
|
||||
'__module__' : 'google.protobuf.internal.any_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestAny)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestAny)
|
||||
_sym_db.RegisterMessage(TestAny.MapValueEntry)
|
||||
|
||||
TestAnyExtension1 = _reflection.GeneratedProtocolMessageType('TestAnyExtension1', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTANYEXTENSION1,
|
||||
__module__ = 'google.protobuf.internal.any_test_pb2'
|
||||
TestAnyExtension1 = _reflection.GeneratedProtocolMessageType('TestAnyExtension1', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTANYEXTENSION1,
|
||||
'__module__' : 'google.protobuf.internal.any_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestAnyExtension1)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestAnyExtension1)
|
||||
|
||||
_TESTANYEXTENSION1.extensions_by_name['extension1'].message_type = _TESTANYEXTENSION1
|
||||
TestAny.RegisterExtension(_TESTANYEXTENSION1.extensions_by_name['extension1'])
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
TestAny.RegisterExtension(_TESTANYEXTENSION1.extensions_by_name['extension1'])
|
||||
|
||||
_TESTANY_MAPVALUEENTRY._options = None
|
||||
DESCRIPTOR._options = None
|
||||
_TESTANY_MAPVALUEENTRY._options = None
|
||||
_TESTANY_MAPVALUEENTRY._serialized_options = b'8\001'
|
||||
_TESTANY._serialized_start=97
|
||||
_TESTANY._serialized_end=289
|
||||
_TESTANY_MAPVALUEENTRY._serialized_start=232
|
||||
_TESTANY_MAPVALUEENTRY._serialized_end=279
|
||||
_TESTANYEXTENSION1._serialized_start=292
|
||||
_TESTANYEXTENSION1._serialized_end=425
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -69,59 +69,40 @@ static const char* kImplVersionName = "api_version";
|
||||
|
||||
static const char* kModuleName = "_api_implementation";
|
||||
static const char kModuleDocstring[] =
|
||||
"_api_implementation is a module that exposes compile-time constants that\n"
|
||||
"determine the default API implementation to use for Python proto2.\n"
|
||||
"\n"
|
||||
"It complements api_implementation.py by setting defaults using compile-time\n"
|
||||
"constants defined in C, such that one can set defaults at compilation\n"
|
||||
"(e.g. with blaze flag --copt=-DPYTHON_PROTO2_CPP_IMPL_V2).";
|
||||
"_api_implementation is a module that exposes compile-time constants that\n"
|
||||
"determine the default API implementation to use for Python proto2.\n"
|
||||
"\n"
|
||||
"It complements api_implementation.py by setting defaults using "
|
||||
"compile-time\n"
|
||||
"constants defined in C, such that one can set defaults at compilation\n"
|
||||
"(e.g. with blaze flag --copt=-DPYTHON_PROTO2_CPP_IMPL_V2).";
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
static struct PyModuleDef _module = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
kModuleName,
|
||||
kModuleDocstring,
|
||||
-1,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
#define INITFUNC PyInit__api_implementation
|
||||
#define INITFUNC_ERRORVAL NULL
|
||||
#else
|
||||
#define INITFUNC init_api_implementation
|
||||
#define INITFUNC_ERRORVAL
|
||||
#endif
|
||||
static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT,
|
||||
kModuleName,
|
||||
kModuleDocstring,
|
||||
-1,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL};
|
||||
|
||||
extern "C" {
|
||||
PyMODINIT_FUNC INITFUNC() {
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
PyObject *module = PyModule_Create(&_module);
|
||||
#else
|
||||
PyObject *module = Py_InitModule3(
|
||||
const_cast<char*>(kModuleName),
|
||||
NULL,
|
||||
const_cast<char*>(kModuleDocstring));
|
||||
#endif
|
||||
if (module == NULL) {
|
||||
return INITFUNC_ERRORVAL;
|
||||
}
|
||||
|
||||
// Adds the module variable "api_version".
|
||||
if (PyModule_AddIntConstant(
|
||||
module,
|
||||
const_cast<char*>(kImplVersionName),
|
||||
kImplVersion))
|
||||
#if PY_MAJOR_VERSION < 3
|
||||
return;
|
||||
#else
|
||||
{ Py_DECREF(module); return NULL; }
|
||||
|
||||
return module;
|
||||
#endif
|
||||
PyMODINIT_FUNC PyInit__api_implementation() {
|
||||
PyObject* module = PyModule_Create(&_module);
|
||||
if (module == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Adds the module variable "api_version".
|
||||
if (PyModule_AddIntConstant(module, const_cast<char*>(kImplVersionName),
|
||||
kImplVersion)) {
|
||||
Py_DECREF(module);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return module;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace python
|
||||
|
||||
Executable → Regular
+11
-72
@@ -32,8 +32,8 @@
|
||||
"""
|
||||
|
||||
import os
|
||||
import warnings
|
||||
import sys
|
||||
import warnings
|
||||
|
||||
try:
|
||||
# pylint: disable=g-import-not-at-top
|
||||
@@ -41,41 +41,15 @@ try:
|
||||
# The compile-time constants in the _api_implementation module can be used to
|
||||
# switch to a certain implementation of the Python API at build time.
|
||||
_api_version = _api_implementation.api_version
|
||||
_proto_extension_modules_exist_in_build = True
|
||||
except ImportError:
|
||||
_api_version = -1 # Unspecified by compiler flags.
|
||||
_proto_extension_modules_exist_in_build = False
|
||||
|
||||
if _api_version == 1:
|
||||
raise ValueError('api_version=1 is no longer supported.')
|
||||
if _api_version < 0: # Still unspecified?
|
||||
try:
|
||||
# The presence of this module in a build allows the proto implementation to
|
||||
# be upgraded merely via build deps rather than a compiler flag or the
|
||||
# runtime environment variable.
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf import _use_fast_cpp_protos
|
||||
# Work around a known issue in the classic bootstrap .par import hook.
|
||||
if not _use_fast_cpp_protos:
|
||||
raise ImportError('_use_fast_cpp_protos import succeeded but was None')
|
||||
del _use_fast_cpp_protos
|
||||
_api_version = 2
|
||||
except ImportError:
|
||||
try:
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf.internal import use_pure_python
|
||||
del use_pure_python # Avoids a pylint error and namespace pollution.
|
||||
except ImportError:
|
||||
# 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')
|
||||
|
||||
_default_implementation_type = ('cpp' if _api_version > 0 else 'python')
|
||||
|
||||
|
||||
# This environment variable can be used to switch to a certain implementation
|
||||
# of the Python API, overriding the compile-time constants in the
|
||||
@@ -92,21 +66,6 @@ if 'PyPy' in sys.version and _implementation_type == 'cpp':
|
||||
'Falling back to the python implementation.')
|
||||
_implementation_type = 'python'
|
||||
|
||||
# This environment variable can be used to switch between the two
|
||||
# 'cpp' implementations, overriding the compile-time constants in the
|
||||
# _api_implementation module. Right now only '2' is supported. Any other
|
||||
# value will cause an error to be raised.
|
||||
_implementation_version_str = os.getenv(
|
||||
'PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION', '2')
|
||||
|
||||
if _implementation_version_str != '2':
|
||||
raise ValueError(
|
||||
'unsupported PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION: "' +
|
||||
_implementation_version_str + '" (supported versions: 2)'
|
||||
)
|
||||
|
||||
_implementation_version = int(_implementation_version_str)
|
||||
|
||||
|
||||
# Detect if serialization should be deterministic by default
|
||||
try:
|
||||
@@ -137,37 +96,17 @@ def Type():
|
||||
return _implementation_type
|
||||
|
||||
|
||||
def _SetType(implementation_type):
|
||||
"""Never use! Only for protobuf benchmark."""
|
||||
global _implementation_type
|
||||
_implementation_type = implementation_type
|
||||
|
||||
|
||||
# See comment on 'Type' above.
|
||||
def Version():
|
||||
return _implementation_version
|
||||
return 2
|
||||
|
||||
|
||||
# For internal use only
|
||||
def IsPythonDefaultSerializationDeterministic():
|
||||
return _python_deterministic_proto_serialization
|
||||
|
||||
# DO NOT USE: For migration and testing only. Will be removed when Proto3
|
||||
# defaults to preserve unknowns.
|
||||
if _implementation_type == 'cpp':
|
||||
try:
|
||||
# pylint: disable=g-import-not-at-top
|
||||
from google.protobuf.pyext import _message
|
||||
|
||||
def GetPythonProto3PreserveUnknownsDefault():
|
||||
return _message.GetPythonProto3PreserveUnknownsDefault()
|
||||
|
||||
def SetPythonProto3PreserveUnknownsDefault(preserve):
|
||||
_message.SetPythonProto3PreserveUnknownsDefault(preserve)
|
||||
except ImportError:
|
||||
# Unrecognized cpp implementation. Skipping the unknown fields APIs.
|
||||
pass
|
||||
else:
|
||||
_python_proto3_preserve_unknowns_default = True
|
||||
|
||||
def GetPythonProto3PreserveUnknownsDefault():
|
||||
return _python_proto3_preserve_unknowns_default
|
||||
|
||||
def SetPythonProto3PreserveUnknownsDefault(preserve):
|
||||
global _python_proto3_preserve_unknowns_default
|
||||
_python_proto3_preserve_unknowns_default = preserve
|
||||
|
||||
Executable → Regular
+166
-153
@@ -33,153 +33,16 @@
|
||||
This file defines container classes which represent categories of protocol
|
||||
buffer field types which need extra maintenance. Currently these categories
|
||||
are:
|
||||
- Repeated scalar fields - These are all repeated fields which aren't
|
||||
|
||||
- Repeated scalar fields - These are all repeated fields which aren't
|
||||
composite (e.g. they are of simple types like int32, string, etc).
|
||||
- Repeated composite fields - Repeated fields which are composite. This
|
||||
- Repeated composite fields - Repeated fields which are composite. This
|
||||
includes groups and nested messages.
|
||||
"""
|
||||
|
||||
__author__ = 'petar@google.com (Petar Petrov)'
|
||||
|
||||
import collections
|
||||
import sys
|
||||
|
||||
if sys.version_info[0] < 3:
|
||||
# We would use collections.MutableMapping all the time, but in Python 2 it
|
||||
# doesn't define __slots__. This causes two significant problems:
|
||||
#
|
||||
# 1. we can't disallow arbitrary attribute assignment, even if our derived
|
||||
# classes *do* define __slots__.
|
||||
#
|
||||
# 2. we can't safely derive a C type from it without __slots__ defined (the
|
||||
# interpreter expects to find a dict at tp_dictoffset, which we can't
|
||||
# robustly provide. And we don't want an instance dict anyway.
|
||||
#
|
||||
# So this is the Python 2.7 definition of Mapping/MutableMapping functions
|
||||
# verbatim, except that:
|
||||
# 1. We declare __slots__.
|
||||
# 2. We don't declare this as a virtual base class. The classes defined
|
||||
# in collections are the interesting base classes, not us.
|
||||
#
|
||||
# Note: deriving from object is critical. It is the only thing that makes
|
||||
# this a true type, allowing us to derive from it in C++ cleanly and making
|
||||
# __slots__ properly disallow arbitrary element assignment.
|
||||
|
||||
class Mapping(object):
|
||||
__slots__ = ()
|
||||
|
||||
def get(self, key, default=None):
|
||||
try:
|
||||
return self[key]
|
||||
except KeyError:
|
||||
return default
|
||||
|
||||
def __contains__(self, key):
|
||||
try:
|
||||
self[key]
|
||||
except KeyError:
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
|
||||
def iterkeys(self):
|
||||
return iter(self)
|
||||
|
||||
def itervalues(self):
|
||||
for key in self:
|
||||
yield self[key]
|
||||
|
||||
def iteritems(self):
|
||||
for key in self:
|
||||
yield (key, self[key])
|
||||
|
||||
def keys(self):
|
||||
return list(self)
|
||||
|
||||
def items(self):
|
||||
return [(key, self[key]) for key in self]
|
||||
|
||||
def values(self):
|
||||
return [self[key] for key in self]
|
||||
|
||||
# Mappings are not hashable by default, but subclasses can change this
|
||||
__hash__ = None
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, collections.Mapping):
|
||||
return NotImplemented
|
||||
return dict(self.items()) == dict(other.items())
|
||||
|
||||
def __ne__(self, other):
|
||||
return not (self == other)
|
||||
|
||||
class MutableMapping(Mapping):
|
||||
__slots__ = ()
|
||||
|
||||
__marker = object()
|
||||
|
||||
def pop(self, key, default=__marker):
|
||||
try:
|
||||
value = self[key]
|
||||
except KeyError:
|
||||
if default is self.__marker:
|
||||
raise
|
||||
return default
|
||||
else:
|
||||
del self[key]
|
||||
return value
|
||||
|
||||
def popitem(self):
|
||||
try:
|
||||
key = next(iter(self))
|
||||
except StopIteration:
|
||||
raise KeyError
|
||||
value = self[key]
|
||||
del self[key]
|
||||
return key, value
|
||||
|
||||
def clear(self):
|
||||
try:
|
||||
while True:
|
||||
self.popitem()
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
def update(*args, **kwds):
|
||||
if len(args) > 2:
|
||||
raise TypeError("update() takes at most 2 positional "
|
||||
"arguments ({} given)".format(len(args)))
|
||||
elif not args:
|
||||
raise TypeError("update() takes at least 1 argument (0 given)")
|
||||
self = args[0]
|
||||
other = args[1] if len(args) >= 2 else ()
|
||||
|
||||
if isinstance(other, Mapping):
|
||||
for key in other:
|
||||
self[key] = other[key]
|
||||
elif hasattr(other, "keys"):
|
||||
for key in other.keys():
|
||||
self[key] = other[key]
|
||||
else:
|
||||
for key, value in other:
|
||||
self[key] = value
|
||||
for key, value in kwds.items():
|
||||
self[key] = value
|
||||
|
||||
def setdefault(self, key, default=None):
|
||||
try:
|
||||
return self[key]
|
||||
except KeyError:
|
||||
self[key] = default
|
||||
return default
|
||||
|
||||
collections.Mapping.register(Mapping)
|
||||
collections.MutableMapping.register(MutableMapping)
|
||||
|
||||
else:
|
||||
# In Python 3 we can just use MutableMapping directly, because it defines
|
||||
# __slots__.
|
||||
MutableMapping = collections.MutableMapping
|
||||
import collections.abc
|
||||
|
||||
|
||||
class BaseContainer(object):
|
||||
@@ -226,22 +89,27 @@ class BaseContainer(object):
|
||||
kwargs['cmp'] = kwargs.pop('sort_function')
|
||||
self._values.sort(*args, **kwargs)
|
||||
|
||||
def reverse(self):
|
||||
self._values.reverse()
|
||||
|
||||
|
||||
collections.abc.MutableSequence.register(BaseContainer)
|
||||
|
||||
|
||||
class RepeatedScalarFieldContainer(BaseContainer):
|
||||
|
||||
"""Simple, type-checked, list-like container for holding repeated scalars."""
|
||||
|
||||
# Disallows assignment to other attributes.
|
||||
__slots__ = ['_type_checker']
|
||||
|
||||
def __init__(self, message_listener, type_checker):
|
||||
"""
|
||||
Args:
|
||||
message_listener: A MessageListener implementation.
|
||||
The RepeatedScalarFieldContainer will call this object's
|
||||
Modified() method when it is modified.
|
||||
"""Args:
|
||||
|
||||
message_listener: A MessageListener implementation. The
|
||||
RepeatedScalarFieldContainer will call this object's Modified() method
|
||||
when it is modified.
|
||||
type_checker: A type_checkers.ValueChecker instance to run on elements
|
||||
inserted into this container.
|
||||
inserted into this container.
|
||||
"""
|
||||
super(RepeatedScalarFieldContainer, self).__init__(message_listener)
|
||||
self._type_checker = type_checker
|
||||
@@ -337,8 +205,6 @@ class RepeatedScalarFieldContainer(BaseContainer):
|
||||
# We are presumably comparing against some other sequence type.
|
||||
return other == self._values
|
||||
|
||||
collections.MutableSequence.register(BaseContainer)
|
||||
|
||||
|
||||
class RepeatedCompositeFieldContainer(BaseContainer):
|
||||
|
||||
@@ -376,8 +242,27 @@ class RepeatedCompositeFieldContainer(BaseContainer):
|
||||
self._message_listener.Modified()
|
||||
return new_element
|
||||
|
||||
def append(self, value):
|
||||
"""Appends one element by copying the message."""
|
||||
new_element = self._message_descriptor._concrete_class()
|
||||
new_element._SetListener(self._message_listener)
|
||||
new_element.CopyFrom(value)
|
||||
self._values.append(new_element)
|
||||
if not self._message_listener.dirty:
|
||||
self._message_listener.Modified()
|
||||
|
||||
def insert(self, key, value):
|
||||
"""Inserts the item at the specified position by copying."""
|
||||
new_element = self._message_descriptor._concrete_class()
|
||||
new_element._SetListener(self._message_listener)
|
||||
new_element.CopyFrom(value)
|
||||
self._values.insert(key, new_element)
|
||||
if not self._message_listener.dirty:
|
||||
self._message_listener.Modified()
|
||||
|
||||
def extend(self, elem_seq):
|
||||
"""Extends by appending the given sequence of elements of the same type
|
||||
|
||||
as this one, copying each individual message.
|
||||
"""
|
||||
message_class = self._message_descriptor._concrete_class
|
||||
@@ -431,7 +316,7 @@ class RepeatedCompositeFieldContainer(BaseContainer):
|
||||
return self._values == other._values
|
||||
|
||||
|
||||
class ScalarMap(MutableMapping):
|
||||
class ScalarMap(collections.abc.MutableMapping):
|
||||
|
||||
"""Simple, type-checked, dict-like container for holding repeated scalars."""
|
||||
|
||||
@@ -521,7 +406,7 @@ class ScalarMap(MutableMapping):
|
||||
return self._entry_descriptor._concrete_class
|
||||
|
||||
|
||||
class MessageMap(MutableMapping):
|
||||
class MessageMap(collections.abc.MutableMapping):
|
||||
|
||||
"""Simple, type-checked, dict-like container for with submessage values."""
|
||||
|
||||
@@ -605,7 +490,8 @@ class MessageMap(MutableMapping):
|
||||
return repr(self._values)
|
||||
|
||||
def MergeFrom(self, other):
|
||||
for key in other:
|
||||
# pylint: disable=protected-access
|
||||
for key in other._values:
|
||||
# According to documentation: "When parsing from the wire or when merging,
|
||||
# if there are duplicate map keys the last key seen is used".
|
||||
if key in self:
|
||||
@@ -628,3 +514,130 @@ class MessageMap(MutableMapping):
|
||||
|
||||
def GetEntryClass(self):
|
||||
return self._entry_descriptor._concrete_class
|
||||
|
||||
|
||||
class _UnknownField(object):
|
||||
|
||||
"""A parsed unknown field."""
|
||||
|
||||
# Disallows assignment to other attributes.
|
||||
__slots__ = ['_field_number', '_wire_type', '_data']
|
||||
|
||||
def __init__(self, field_number, wire_type, data):
|
||||
self._field_number = field_number
|
||||
self._wire_type = wire_type
|
||||
self._data = data
|
||||
return
|
||||
|
||||
def __lt__(self, other):
|
||||
# pylint: disable=protected-access
|
||||
return self._field_number < other._field_number
|
||||
|
||||
def __eq__(self, other):
|
||||
if self is other:
|
||||
return True
|
||||
# pylint: disable=protected-access
|
||||
return (self._field_number == other._field_number and
|
||||
self._wire_type == other._wire_type and
|
||||
self._data == other._data)
|
||||
|
||||
|
||||
class UnknownFieldRef(object):
|
||||
|
||||
def __init__(self, parent, index):
|
||||
self._parent = parent
|
||||
self._index = index
|
||||
return
|
||||
|
||||
def _check_valid(self):
|
||||
if not self._parent:
|
||||
raise ValueError('UnknownField does not exist. '
|
||||
'The parent message might be cleared.')
|
||||
if self._index >= len(self._parent):
|
||||
raise ValueError('UnknownField does not exist. '
|
||||
'The parent message might be cleared.')
|
||||
|
||||
@property
|
||||
def field_number(self):
|
||||
self._check_valid()
|
||||
# pylint: disable=protected-access
|
||||
return self._parent._internal_get(self._index)._field_number
|
||||
|
||||
@property
|
||||
def wire_type(self):
|
||||
self._check_valid()
|
||||
# pylint: disable=protected-access
|
||||
return self._parent._internal_get(self._index)._wire_type
|
||||
|
||||
@property
|
||||
def data(self):
|
||||
self._check_valid()
|
||||
# pylint: disable=protected-access
|
||||
return self._parent._internal_get(self._index)._data
|
||||
|
||||
|
||||
class UnknownFieldSet(object):
|
||||
|
||||
"""UnknownField container"""
|
||||
|
||||
# Disallows assignment to other attributes.
|
||||
__slots__ = ['_values']
|
||||
|
||||
def __init__(self):
|
||||
self._values = []
|
||||
|
||||
def __getitem__(self, index):
|
||||
if self._values is None:
|
||||
raise ValueError('UnknownFields does not exist. '
|
||||
'The parent message might be cleared.')
|
||||
size = len(self._values)
|
||||
if index < 0:
|
||||
index += size
|
||||
if index < 0 or index >= size:
|
||||
raise IndexError('index %d out of range'.index)
|
||||
|
||||
return UnknownFieldRef(self, index)
|
||||
|
||||
def _internal_get(self, index):
|
||||
return self._values[index]
|
||||
|
||||
def __len__(self):
|
||||
if self._values is None:
|
||||
raise ValueError('UnknownFields does not exist. '
|
||||
'The parent message might be cleared.')
|
||||
return len(self._values)
|
||||
|
||||
def _add(self, field_number, wire_type, data):
|
||||
unknown_field = _UnknownField(field_number, wire_type, data)
|
||||
self._values.append(unknown_field)
|
||||
return unknown_field
|
||||
|
||||
def __iter__(self):
|
||||
for i in range(len(self)):
|
||||
yield UnknownFieldRef(self, i)
|
||||
|
||||
def _extend(self, other):
|
||||
if other is None:
|
||||
return
|
||||
# pylint: disable=protected-access
|
||||
self._values.extend(other._values)
|
||||
|
||||
def __eq__(self, other):
|
||||
if self is other:
|
||||
return True
|
||||
# Sort unknown fields because their order shouldn't
|
||||
# affect equality test.
|
||||
values = list(self._values)
|
||||
if other is None:
|
||||
return not values
|
||||
values.sort()
|
||||
# pylint: disable=protected-access
|
||||
other_values = sorted(other._values)
|
||||
return values == other_values
|
||||
|
||||
def _clear(self):
|
||||
for value in self._values:
|
||||
# pylint: disable=protected-access
|
||||
if isinstance(value._data, UnknownFieldSet):
|
||||
value._data._clear() # pylint: disable=protected-access
|
||||
self._values = None
|
||||
Executable → Regular
+225
-50
@@ -80,25 +80,15 @@ we repeatedly read a tag, look up the corresponding decoder, and invoke it.
|
||||
|
||||
__author__ = 'kenton@google.com (Kenton Varda)'
|
||||
|
||||
import math
|
||||
import struct
|
||||
|
||||
import six
|
||||
|
||||
if six.PY3:
|
||||
long = int
|
||||
|
||||
from google.protobuf.internal import containers
|
||||
from google.protobuf.internal import encoder
|
||||
from google.protobuf.internal import wire_format
|
||||
from google.protobuf import message
|
||||
|
||||
|
||||
# This will overflow and thus become IEEE-754 "infinity". We would use
|
||||
# "float('inf')" but it doesn't work on Windows pre-Python-2.6.
|
||||
_POS_INF = 1e10000
|
||||
_NEG_INF = -_POS_INF
|
||||
_NAN = _POS_INF * 0
|
||||
|
||||
|
||||
# This is not for optimization, but rather to avoid conflicts with local
|
||||
# variables named "message".
|
||||
_DecodeError = message.DecodeError
|
||||
@@ -118,7 +108,7 @@ def _VarintDecoder(mask, result_type):
|
||||
result = 0
|
||||
shift = 0
|
||||
while 1:
|
||||
b = six.indexbytes(buffer, pos)
|
||||
b = buffer[pos]
|
||||
result |= ((b & 0x7f) << shift)
|
||||
pos += 1
|
||||
if not (b & 0x80):
|
||||
@@ -141,7 +131,7 @@ def _SignedVarintDecoder(bits, result_type):
|
||||
result = 0
|
||||
shift = 0
|
||||
while 1:
|
||||
b = six.indexbytes(buffer, pos)
|
||||
b = buffer[pos]
|
||||
result |= ((b & 0x7f) << shift)
|
||||
pos += 1
|
||||
if not (b & 0x80):
|
||||
@@ -154,12 +144,9 @@ def _SignedVarintDecoder(bits, result_type):
|
||||
raise _DecodeError('Too many bytes when decoding varint.')
|
||||
return DecodeVarint
|
||||
|
||||
# We force 32-bit values to int and 64-bit values to long to make
|
||||
# alternate implementations where the distinction is more significant
|
||||
# (e.g. the C++ implementation) simpler.
|
||||
|
||||
_DecodeVarint = _VarintDecoder((1 << 64) - 1, long)
|
||||
_DecodeSignedVarint = _SignedVarintDecoder(64, long)
|
||||
# All 32-bit and 64-bit values are represented as int.
|
||||
_DecodeVarint = _VarintDecoder((1 << 64) - 1, int)
|
||||
_DecodeSignedVarint = _SignedVarintDecoder(64, int)
|
||||
|
||||
# Use these versions for values which must be limited to 32 bits.
|
||||
_DecodeVarint32 = _VarintDecoder((1 << 32) - 1, int)
|
||||
@@ -167,7 +154,7 @@ _DecodeSignedVarint32 = _SignedVarintDecoder(32, int)
|
||||
|
||||
|
||||
def ReadTag(buffer, pos):
|
||||
"""Read a tag from the buffer, and return a (tag_bytes, new_pos) tuple.
|
||||
"""Read a tag from the memoryview, and return a (tag_bytes, new_pos) tuple.
|
||||
|
||||
We return the raw bytes of the tag rather than decoding them. The raw
|
||||
bytes can then be used to look up the proper decoder. This effectively allows
|
||||
@@ -175,13 +162,21 @@ def ReadTag(buffer, pos):
|
||||
for work that is done in C (searching for a byte string in a hash table).
|
||||
In a low-level language it would be much cheaper to decode the varint and
|
||||
use that, but not in Python.
|
||||
"""
|
||||
|
||||
Args:
|
||||
buffer: memoryview object of the encoded bytes
|
||||
pos: int of the current position to start from
|
||||
|
||||
Returns:
|
||||
Tuple[bytes, int] of the tag data and new position.
|
||||
"""
|
||||
start = pos
|
||||
while six.indexbytes(buffer, pos) & 0x80:
|
||||
while buffer[pos] & 0x80:
|
||||
pos += 1
|
||||
pos += 1
|
||||
return (six.binary_type(buffer[start:pos]), pos)
|
||||
|
||||
tag_bytes = buffer[start:pos].tobytes()
|
||||
return tag_bytes, pos
|
||||
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
@@ -196,7 +191,8 @@ def _SimpleDecoder(wire_type, decode_value):
|
||||
_DecodeVarint()
|
||||
"""
|
||||
|
||||
def SpecificDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
def SpecificDecoder(field_number, is_repeated, is_packed, key, new_default,
|
||||
clear_if_default=False):
|
||||
if is_packed:
|
||||
local_DecodeVarint = _DecodeVarint
|
||||
def DecodePackedField(buffer, pos, end, message, field_dict):
|
||||
@@ -236,10 +232,13 @@ def _SimpleDecoder(wire_type, decode_value):
|
||||
return DecodeRepeatedField
|
||||
else:
|
||||
def DecodeField(buffer, pos, end, message, field_dict):
|
||||
(field_dict[key], pos) = decode_value(buffer, pos)
|
||||
(new_value, pos) = decode_value(buffer, pos)
|
||||
if pos > end:
|
||||
del field_dict[key] # Discard corrupt value.
|
||||
raise _DecodeError('Truncated message.')
|
||||
if clear_if_default and not new_value:
|
||||
field_dict.pop(key, None)
|
||||
else:
|
||||
field_dict[key] = new_value
|
||||
return pos
|
||||
return DecodeField
|
||||
|
||||
@@ -295,10 +294,20 @@ def _FloatDecoder():
|
||||
local_unpack = struct.unpack
|
||||
|
||||
def InnerDecode(buffer, pos):
|
||||
"""Decode serialized float to a float and new position.
|
||||
|
||||
Args:
|
||||
buffer: memoryview of the serialized bytes
|
||||
pos: int, position in the memory view to start at.
|
||||
|
||||
Returns:
|
||||
Tuple[float, int] of the deserialized float value and new position
|
||||
in the serialized data.
|
||||
"""
|
||||
# We expect a 32-bit value in little-endian byte order. Bit 1 is the sign
|
||||
# bit, bits 2-9 represent the exponent, and bits 10-32 are the significand.
|
||||
new_pos = pos + 4
|
||||
float_bytes = buffer[pos:new_pos]
|
||||
float_bytes = buffer[pos:new_pos].tobytes()
|
||||
|
||||
# If this value has all its exponent bits set, then it's non-finite.
|
||||
# In Python 2.4, struct.unpack will convert it to a finite 64-bit value.
|
||||
@@ -306,11 +315,11 @@ def _FloatDecoder():
|
||||
if (float_bytes[3:4] in b'\x7F\xFF' and float_bytes[2:3] >= b'\x80'):
|
||||
# If at least one significand bit is set...
|
||||
if float_bytes[0:3] != b'\x00\x00\x80':
|
||||
return (_NAN, new_pos)
|
||||
return (math.nan, new_pos)
|
||||
# If sign bit is set...
|
||||
if float_bytes[3:4] == b'\xFF':
|
||||
return (_NEG_INF, new_pos)
|
||||
return (_POS_INF, new_pos)
|
||||
return (-math.inf, new_pos)
|
||||
return (math.inf, new_pos)
|
||||
|
||||
# Note that we expect someone up-stack to catch struct.error and convert
|
||||
# it to _DecodeError -- this way we don't have to set up exception-
|
||||
@@ -329,10 +338,20 @@ def _DoubleDecoder():
|
||||
local_unpack = struct.unpack
|
||||
|
||||
def InnerDecode(buffer, pos):
|
||||
"""Decode serialized double to a double and new position.
|
||||
|
||||
Args:
|
||||
buffer: memoryview of the serialized bytes.
|
||||
pos: int, position in the memory view to start at.
|
||||
|
||||
Returns:
|
||||
Tuple[float, int] of the decoded double value and new position
|
||||
in the serialized data.
|
||||
"""
|
||||
# We expect a 64-bit value in little-endian byte order. Bit 1 is the sign
|
||||
# bit, bits 2-12 represent the exponent, and bits 13-64 are the significand.
|
||||
new_pos = pos + 8
|
||||
double_bytes = buffer[pos:new_pos]
|
||||
double_bytes = buffer[pos:new_pos].tobytes()
|
||||
|
||||
# If this value has all its exponent bits set and at least one significand
|
||||
# bit set, it's not a number. In Python 2.4, struct.unpack will treat it
|
||||
@@ -340,7 +359,7 @@ def _DoubleDecoder():
|
||||
if ((double_bytes[7:8] in b'\x7F\xFF')
|
||||
and (double_bytes[6:7] >= b'\xF0')
|
||||
and (double_bytes[0:7] != b'\x00\x00\x00\x00\x00\x00\xF0')):
|
||||
return (_NAN, new_pos)
|
||||
return (math.nan, new_pos)
|
||||
|
||||
# Note that we expect someone up-stack to catch struct.error and convert
|
||||
# it to _DecodeError -- this way we don't have to set up exception-
|
||||
@@ -350,11 +369,25 @@ def _DoubleDecoder():
|
||||
return _SimpleDecoder(wire_format.WIRETYPE_FIXED64, InnerDecode)
|
||||
|
||||
|
||||
def EnumDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
def EnumDecoder(field_number, is_repeated, is_packed, key, new_default,
|
||||
clear_if_default=False):
|
||||
"""Returns a decoder for enum field."""
|
||||
enum_type = key.enum_type
|
||||
if is_packed:
|
||||
local_DecodeVarint = _DecodeVarint
|
||||
def DecodePackedField(buffer, pos, end, message, field_dict):
|
||||
"""Decode serialized packed enum to its value and a new position.
|
||||
|
||||
Args:
|
||||
buffer: memoryview of the serialized bytes.
|
||||
pos: int, position in the memory view to start at.
|
||||
end: int, end position of serialized data
|
||||
message: Message object to store unknown fields in
|
||||
field_dict: Map[Descriptor, Any] to store decoded values in.
|
||||
|
||||
Returns:
|
||||
int, new position in serialized data.
|
||||
"""
|
||||
value = field_dict.get(key)
|
||||
if value is None:
|
||||
value = field_dict.setdefault(key, new_default(message))
|
||||
@@ -365,6 +398,7 @@ def EnumDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
while pos < endpoint:
|
||||
value_start_pos = pos
|
||||
(element, pos) = _DecodeSignedVarint32(buffer, pos)
|
||||
# pylint: disable=protected-access
|
||||
if element in enum_type.values_by_number:
|
||||
value.append(element)
|
||||
else:
|
||||
@@ -372,13 +406,22 @@ def EnumDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
message._unknown_fields = []
|
||||
tag_bytes = encoder.TagBytes(field_number,
|
||||
wire_format.WIRETYPE_VARINT)
|
||||
|
||||
message._unknown_fields.append(
|
||||
(tag_bytes, buffer[value_start_pos:pos]))
|
||||
(tag_bytes, buffer[value_start_pos:pos].tobytes()))
|
||||
if message._unknown_field_set is None:
|
||||
message._unknown_field_set = containers.UnknownFieldSet()
|
||||
message._unknown_field_set._add(
|
||||
field_number, wire_format.WIRETYPE_VARINT, element)
|
||||
# pylint: enable=protected-access
|
||||
if pos > endpoint:
|
||||
if element in enum_type.values_by_number:
|
||||
del value[-1] # Discard corrupt value.
|
||||
else:
|
||||
del message._unknown_fields[-1]
|
||||
# pylint: disable=protected-access
|
||||
del message._unknown_field_set._values[-1]
|
||||
# pylint: enable=protected-access
|
||||
raise _DecodeError('Packed element was truncated.')
|
||||
return pos
|
||||
return DecodePackedField
|
||||
@@ -386,18 +429,36 @@ def EnumDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
tag_bytes = encoder.TagBytes(field_number, wire_format.WIRETYPE_VARINT)
|
||||
tag_len = len(tag_bytes)
|
||||
def DecodeRepeatedField(buffer, pos, end, message, field_dict):
|
||||
"""Decode serialized repeated enum to its value and a new position.
|
||||
|
||||
Args:
|
||||
buffer: memoryview of the serialized bytes.
|
||||
pos: int, position in the memory view to start at.
|
||||
end: int, end position of serialized data
|
||||
message: Message object to store unknown fields in
|
||||
field_dict: Map[Descriptor, Any] to store decoded values in.
|
||||
|
||||
Returns:
|
||||
int, new position in serialized data.
|
||||
"""
|
||||
value = field_dict.get(key)
|
||||
if value is None:
|
||||
value = field_dict.setdefault(key, new_default(message))
|
||||
while 1:
|
||||
(element, new_pos) = _DecodeSignedVarint32(buffer, pos)
|
||||
# pylint: disable=protected-access
|
||||
if element in enum_type.values_by_number:
|
||||
value.append(element)
|
||||
else:
|
||||
if not message._unknown_fields:
|
||||
message._unknown_fields = []
|
||||
message._unknown_fields.append(
|
||||
(tag_bytes, buffer[pos:new_pos]))
|
||||
(tag_bytes, buffer[pos:new_pos].tobytes()))
|
||||
if message._unknown_field_set is None:
|
||||
message._unknown_field_set = containers.UnknownFieldSet()
|
||||
message._unknown_field_set._add(
|
||||
field_number, wire_format.WIRETYPE_VARINT, element)
|
||||
# pylint: enable=protected-access
|
||||
# Predict that the next tag is another copy of the same repeated
|
||||
# field.
|
||||
pos = new_pos + tag_len
|
||||
@@ -409,10 +470,26 @@ def EnumDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
return DecodeRepeatedField
|
||||
else:
|
||||
def DecodeField(buffer, pos, end, message, field_dict):
|
||||
"""Decode serialized repeated enum to its value and a new position.
|
||||
|
||||
Args:
|
||||
buffer: memoryview of the serialized bytes.
|
||||
pos: int, position in the memory view to start at.
|
||||
end: int, end position of serialized data
|
||||
message: Message object to store unknown fields in
|
||||
field_dict: Map[Descriptor, Any] to store decoded values in.
|
||||
|
||||
Returns:
|
||||
int, new position in serialized data.
|
||||
"""
|
||||
value_start_pos = pos
|
||||
(enum_value, pos) = _DecodeSignedVarint32(buffer, pos)
|
||||
if pos > end:
|
||||
raise _DecodeError('Truncated message.')
|
||||
if clear_if_default and not enum_value:
|
||||
field_dict.pop(key, None)
|
||||
return pos
|
||||
# pylint: disable=protected-access
|
||||
if enum_value in enum_type.values_by_number:
|
||||
field_dict[key] = enum_value
|
||||
else:
|
||||
@@ -421,7 +498,12 @@ def EnumDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
tag_bytes = encoder.TagBytes(field_number,
|
||||
wire_format.WIRETYPE_VARINT)
|
||||
message._unknown_fields.append(
|
||||
(tag_bytes, buffer[value_start_pos:pos]))
|
||||
(tag_bytes, buffer[value_start_pos:pos].tobytes()))
|
||||
if message._unknown_field_set is None:
|
||||
message._unknown_field_set = containers.UnknownFieldSet()
|
||||
message._unknown_field_set._add(
|
||||
field_number, wire_format.WIRETYPE_VARINT, enum_value)
|
||||
# pylint: enable=protected-access
|
||||
return pos
|
||||
return DecodeField
|
||||
|
||||
@@ -458,20 +540,24 @@ BoolDecoder = _ModifiedDecoder(
|
||||
wire_format.WIRETYPE_VARINT, _DecodeVarint, bool)
|
||||
|
||||
|
||||
def StringDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
def StringDecoder(field_number, is_repeated, is_packed, key, new_default,
|
||||
clear_if_default=False):
|
||||
"""Returns a decoder for a string field."""
|
||||
|
||||
local_DecodeVarint = _DecodeVarint
|
||||
local_unicode = six.text_type
|
||||
|
||||
def _ConvertToUnicode(byte_str):
|
||||
def _ConvertToUnicode(memview):
|
||||
"""Convert byte to unicode."""
|
||||
byte_str = memview.tobytes()
|
||||
try:
|
||||
return local_unicode(byte_str, 'utf-8')
|
||||
value = str(byte_str, 'utf-8')
|
||||
except UnicodeDecodeError as e:
|
||||
# add more information to the error message and re-raise it.
|
||||
e.reason = '%s in field: %s' % (e, key.full_name)
|
||||
raise
|
||||
|
||||
return value
|
||||
|
||||
assert not is_packed
|
||||
if is_repeated:
|
||||
tag_bytes = encoder.TagBytes(field_number,
|
||||
@@ -499,12 +585,16 @@ def StringDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
new_pos = pos + size
|
||||
if new_pos > end:
|
||||
raise _DecodeError('Truncated string.')
|
||||
field_dict[key] = _ConvertToUnicode(buffer[pos:new_pos])
|
||||
if clear_if_default and not size:
|
||||
field_dict.pop(key, None)
|
||||
else:
|
||||
field_dict[key] = _ConvertToUnicode(buffer[pos:new_pos])
|
||||
return new_pos
|
||||
return DecodeField
|
||||
|
||||
|
||||
def BytesDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
def BytesDecoder(field_number, is_repeated, is_packed, key, new_default,
|
||||
clear_if_default=False):
|
||||
"""Returns a decoder for a bytes field."""
|
||||
|
||||
local_DecodeVarint = _DecodeVarint
|
||||
@@ -523,7 +613,7 @@ def BytesDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
new_pos = pos + size
|
||||
if new_pos > end:
|
||||
raise _DecodeError('Truncated string.')
|
||||
value.append(buffer[pos:new_pos])
|
||||
value.append(buffer[pos:new_pos].tobytes())
|
||||
# Predict that the next tag is another copy of the same repeated field.
|
||||
pos = new_pos + tag_len
|
||||
if buffer[new_pos:pos] != tag_bytes or new_pos == end:
|
||||
@@ -536,7 +626,10 @@ def BytesDecoder(field_number, is_repeated, is_packed, key, new_default):
|
||||
new_pos = pos + size
|
||||
if new_pos > end:
|
||||
raise _DecodeError('Truncated string.')
|
||||
field_dict[key] = buffer[pos:new_pos]
|
||||
if clear_if_default and not size:
|
||||
field_dict.pop(key, None)
|
||||
else:
|
||||
field_dict[key] = buffer[pos:new_pos].tobytes()
|
||||
return new_pos
|
||||
return DecodeField
|
||||
|
||||
@@ -665,6 +758,18 @@ def MessageSetItemDecoder(descriptor):
|
||||
local_SkipField = SkipField
|
||||
|
||||
def DecodeItem(buffer, pos, end, message, field_dict):
|
||||
"""Decode serialized message set to its value and new position.
|
||||
|
||||
Args:
|
||||
buffer: memoryview of the serialized bytes.
|
||||
pos: int, position in the memory view to start at.
|
||||
end: int, end position of serialized data
|
||||
message: Message object to store unknown fields in
|
||||
field_dict: Map[Descriptor, Any] to store decoded values in.
|
||||
|
||||
Returns:
|
||||
int, new position in serialized data.
|
||||
"""
|
||||
message_set_item_start = pos
|
||||
type_id = -1
|
||||
message_start = -1
|
||||
@@ -695,11 +800,16 @@ def MessageSetItemDecoder(descriptor):
|
||||
raise _DecodeError('MessageSet item missing message.')
|
||||
|
||||
extension = message.Extensions._FindExtensionByNumber(type_id)
|
||||
# pylint: disable=protected-access
|
||||
if extension is not None:
|
||||
value = field_dict.get(extension)
|
||||
if value is None:
|
||||
message_type = extension.message_type
|
||||
if not hasattr(message_type, '_concrete_class'):
|
||||
# pylint: disable=protected-access
|
||||
message._FACTORY.GetPrototype(message_type)
|
||||
value = field_dict.setdefault(
|
||||
extension, extension.message_type._concrete_class())
|
||||
extension, message_type._concrete_class())
|
||||
if value._InternalParse(buffer, message_start,message_end) != message_end:
|
||||
# The only reason _InternalParse would return early is if it encountered
|
||||
# an end-group tag.
|
||||
@@ -707,8 +817,15 @@ def MessageSetItemDecoder(descriptor):
|
||||
else:
|
||||
if not message._unknown_fields:
|
||||
message._unknown_fields = []
|
||||
message._unknown_fields.append((MESSAGE_SET_ITEM_TAG,
|
||||
buffer[message_set_item_start:pos]))
|
||||
message._unknown_fields.append(
|
||||
(MESSAGE_SET_ITEM_TAG, buffer[message_set_item_start:pos].tobytes()))
|
||||
if message._unknown_field_set is None:
|
||||
message._unknown_field_set = containers.UnknownFieldSet()
|
||||
message._unknown_field_set._add(
|
||||
type_id,
|
||||
wire_format.WIRETYPE_LENGTH_DELIMITED,
|
||||
buffer[message_start:message_end].tobytes())
|
||||
# pylint: enable=protected-access
|
||||
|
||||
return pos
|
||||
|
||||
@@ -746,7 +863,7 @@ def MapDecoder(field_descriptor, new_default, is_message_map):
|
||||
raise _DecodeError('Unexpected end-group tag.')
|
||||
|
||||
if is_message_map:
|
||||
value[submsg.key].MergeFrom(submsg.value)
|
||||
value[submsg.key].CopyFrom(submsg.value)
|
||||
else:
|
||||
value[submsg.key] = submsg.value
|
||||
|
||||
@@ -767,7 +884,7 @@ def _SkipVarint(buffer, pos, end):
|
||||
# Previously ord(buffer[pos]) raised IndexError when pos is out of range.
|
||||
# With this code, ord(b'') raises TypeError. Both are handled in
|
||||
# python_message.py to generate a 'Truncated message' error.
|
||||
while ord(buffer[pos:pos+1]) & 0x80:
|
||||
while ord(buffer[pos:pos+1].tobytes()) & 0x80:
|
||||
pos += 1
|
||||
pos += 1
|
||||
if pos > end:
|
||||
@@ -782,6 +899,13 @@ def _SkipFixed64(buffer, pos, end):
|
||||
raise _DecodeError('Truncated message.')
|
||||
return pos
|
||||
|
||||
|
||||
def _DecodeFixed64(buffer, pos):
|
||||
"""Decode a fixed64."""
|
||||
new_pos = pos + 8
|
||||
return (struct.unpack('<Q', buffer[pos:new_pos])[0], new_pos)
|
||||
|
||||
|
||||
def _SkipLengthDelimited(buffer, pos, end):
|
||||
"""Skip a length-delimited value. Returns the new position."""
|
||||
|
||||
@@ -791,6 +915,7 @@ def _SkipLengthDelimited(buffer, pos, end):
|
||||
raise _DecodeError('Truncated message.')
|
||||
return pos
|
||||
|
||||
|
||||
def _SkipGroup(buffer, pos, end):
|
||||
"""Skip sub-group. Returns the new position."""
|
||||
|
||||
@@ -801,11 +926,53 @@ def _SkipGroup(buffer, pos, end):
|
||||
return pos
|
||||
pos = new_pos
|
||||
|
||||
|
||||
def _DecodeUnknownFieldSet(buffer, pos, end_pos=None):
|
||||
"""Decode UnknownFieldSet. Returns the UnknownFieldSet and new position."""
|
||||
|
||||
unknown_field_set = containers.UnknownFieldSet()
|
||||
while end_pos is None or pos < end_pos:
|
||||
(tag_bytes, pos) = ReadTag(buffer, pos)
|
||||
(tag, _) = _DecodeVarint(tag_bytes, 0)
|
||||
field_number, wire_type = wire_format.UnpackTag(tag)
|
||||
if wire_type == wire_format.WIRETYPE_END_GROUP:
|
||||
break
|
||||
(data, pos) = _DecodeUnknownField(buffer, pos, wire_type)
|
||||
# pylint: disable=protected-access
|
||||
unknown_field_set._add(field_number, wire_type, data)
|
||||
|
||||
return (unknown_field_set, pos)
|
||||
|
||||
|
||||
def _DecodeUnknownField(buffer, pos, wire_type):
|
||||
"""Decode a unknown field. Returns the UnknownField and new position."""
|
||||
|
||||
if wire_type == wire_format.WIRETYPE_VARINT:
|
||||
(data, pos) = _DecodeVarint(buffer, pos)
|
||||
elif wire_type == wire_format.WIRETYPE_FIXED64:
|
||||
(data, pos) = _DecodeFixed64(buffer, pos)
|
||||
elif wire_type == wire_format.WIRETYPE_FIXED32:
|
||||
(data, pos) = _DecodeFixed32(buffer, pos)
|
||||
elif wire_type == wire_format.WIRETYPE_LENGTH_DELIMITED:
|
||||
(size, pos) = _DecodeVarint(buffer, pos)
|
||||
data = buffer[pos:pos+size].tobytes()
|
||||
pos += size
|
||||
elif wire_type == wire_format.WIRETYPE_START_GROUP:
|
||||
(data, pos) = _DecodeUnknownFieldSet(buffer, pos)
|
||||
elif wire_type == wire_format.WIRETYPE_END_GROUP:
|
||||
return (0, -1)
|
||||
else:
|
||||
raise _DecodeError('Wrong wire type in tag.')
|
||||
|
||||
return (data, pos)
|
||||
|
||||
|
||||
def _EndGroup(buffer, pos, end):
|
||||
"""Skipping an END_GROUP tag returns -1 to tell the parent loop to break."""
|
||||
|
||||
return -1
|
||||
|
||||
|
||||
def _SkipFixed32(buffer, pos, end):
|
||||
"""Skip a fixed32 value. Returns the new position."""
|
||||
|
||||
@@ -814,6 +981,14 @@ def _SkipFixed32(buffer, pos, end):
|
||||
raise _DecodeError('Truncated message.')
|
||||
return pos
|
||||
|
||||
|
||||
def _DecodeFixed32(buffer, pos):
|
||||
"""Decode a fixed32."""
|
||||
|
||||
new_pos = pos + 4
|
||||
return (struct.unpack('<I', buffer[pos:new_pos])[0], new_pos)
|
||||
|
||||
|
||||
def _RaiseInvalidWireType(buffer, pos, end):
|
||||
"""Skip function for unknown wire types. Raises an exception."""
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -34,25 +32,28 @@
|
||||
|
||||
__author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
import warnings
|
||||
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import descriptor_pb2
|
||||
from google.protobuf.internal import factory_test2_pb2
|
||||
from google.protobuf.internal import no_package_pb2
|
||||
from google.protobuf.internal import testing_refleaks
|
||||
from google.protobuf import descriptor_database
|
||||
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class DescriptorDatabaseTest(unittest.TestCase):
|
||||
|
||||
def testAdd(self):
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
file_desc_proto = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
file_desc_proto2 = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
no_package_pb2.DESCRIPTOR.serialized_pb)
|
||||
db.Add(file_desc_proto)
|
||||
db.Add(file_desc_proto2)
|
||||
|
||||
self.assertEqual(file_desc_proto, db.FindFileByName(
|
||||
'google/protobuf/internal/factory_test2.proto'))
|
||||
@@ -76,6 +77,10 @@ class DescriptorDatabaseTest(unittest.TestCase):
|
||||
# Can find enum value.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory2Enum.FACTORY_2_VALUE_0'))
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.FACTORY_2_VALUE_0'))
|
||||
self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
|
||||
'.NO_PACKAGE_VALUE_0'))
|
||||
# Can find top level extension.
|
||||
self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.another_field'))
|
||||
@@ -95,9 +100,8 @@ class DescriptorDatabaseTest(unittest.TestCase):
|
||||
self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestAllTypes.none_field'))
|
||||
|
||||
self.assertRaises(KeyError,
|
||||
db.FindFileContainingSymbol,
|
||||
'protobuf_unittest.NoneMessage')
|
||||
with self.assertRaisesRegexp(KeyError, r'\'protobuf_unittest\.NoneMessage\''):
|
||||
db.FindFileContainingSymbol('protobuf_unittest.NoneMessage')
|
||||
|
||||
def testConflictRegister(self):
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
@@ -106,19 +110,18 @@ class DescriptorDatabaseTest(unittest.TestCase):
|
||||
db.Add(unittest_fd)
|
||||
conflict_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb)
|
||||
conflict_fd.name = 'other_file'
|
||||
conflict_fd.name = 'other_file2'
|
||||
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": ',
|
||||
self.assertIn('Conflict register for file "other_file2": ',
|
||||
str(w[0].message))
|
||||
self.assertIn('already defined in file '
|
||||
'"google/protobuf/unittest.proto"',
|
||||
str(w[0].message))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -36,14 +34,9 @@ __author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
import copy
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
import warnings
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
|
||||
from google.protobuf import unittest_import_pb2
|
||||
from google.protobuf import unittest_import_public_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
@@ -55,6 +48,8 @@ from google.protobuf.internal import factory_test1_pb2
|
||||
from google.protobuf.internal import factory_test2_pb2
|
||||
from google.protobuf.internal import file_options_test_pb2
|
||||
from google.protobuf.internal import more_messages_pb2
|
||||
from google.protobuf.internal import no_package_pb2
|
||||
from google.protobuf.internal import testing_refleaks
|
||||
from google.protobuf import descriptor
|
||||
from google.protobuf import descriptor_database
|
||||
from google.protobuf import descriptor_pool
|
||||
@@ -63,6 +58,9 @@ from google.protobuf import symbol_database
|
||||
|
||||
|
||||
|
||||
warnings.simplefilter('error', DeprecationWarning)
|
||||
|
||||
|
||||
class DescriptorPoolTestBase(object):
|
||||
|
||||
def testFindFileByName(self):
|
||||
@@ -120,7 +118,6 @@ class DescriptorPoolTestBase(object):
|
||||
self.assertIsInstance(file_desc5, descriptor.FileDescriptor)
|
||||
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')
|
||||
@@ -129,6 +126,32 @@ class DescriptorPoolTestBase(object):
|
||||
assert descriptor_pool.Default().FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestService')
|
||||
|
||||
# Can find field.
|
||||
file_desc6 = self.pool.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.Factory1Message.list_value')
|
||||
self.assertIsInstance(file_desc6, descriptor.FileDescriptor)
|
||||
self.assertEqual('google/protobuf/internal/factory_test1.proto',
|
||||
file_desc6.name)
|
||||
|
||||
# Can find top level Enum value.
|
||||
file_desc7 = self.pool.FindFileContainingSymbol(
|
||||
'google.protobuf.python.internal.FACTORY_1_VALUE_0')
|
||||
self.assertIsInstance(file_desc7, descriptor.FileDescriptor)
|
||||
self.assertEqual('google/protobuf/internal/factory_test1.proto',
|
||||
file_desc7.name)
|
||||
|
||||
# Can find nested Enum value.
|
||||
file_desc8 = self.pool.FindFileContainingSymbol(
|
||||
'protobuf_unittest.TestAllTypes.FOO')
|
||||
self.assertIsInstance(file_desc8, descriptor.FileDescriptor)
|
||||
self.assertEqual('google/protobuf/unittest.proto',
|
||||
file_desc8.name)
|
||||
|
||||
# TODO(jieluo): Add tests for no package when b/13860351 is fixed.
|
||||
|
||||
self.assertRaises(KeyError, self.pool.FindFileContainingSymbol,
|
||||
'google.protobuf.python.internal.Factory1Message.none_field')
|
||||
|
||||
def testFindFileContainingSymbolFailure(self):
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindFileContainingSymbol('Does not exist')
|
||||
@@ -217,11 +240,10 @@ class DescriptorPoolTestBase(object):
|
||||
|
||||
def testFindTypeErrors(self):
|
||||
self.assertRaises(TypeError, self.pool.FindExtensionByNumber, '')
|
||||
self.assertRaises(KeyError, self.pool.FindMethodByName, '')
|
||||
|
||||
# TODO(jieluo): Fix python to raise correct errors.
|
||||
if api_implementation.Type() == 'cpp':
|
||||
self.assertRaises(TypeError, self.pool.FindMethodByName, 0)
|
||||
self.assertRaises(KeyError, self.pool.FindMethodByName, '')
|
||||
error_type = TypeError
|
||||
else:
|
||||
error_type = AttributeError
|
||||
@@ -231,6 +253,7 @@ class DescriptorPoolTestBase(object):
|
||||
self.assertRaises(error_type, self.pool.FindEnumTypeByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindOneofByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindServiceByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindMethodByName, 0)
|
||||
self.assertRaises(error_type, self.pool.FindFileContainingSymbol, 0)
|
||||
if api_implementation.Type() == 'python':
|
||||
error_type = KeyError
|
||||
@@ -275,11 +298,6 @@ class DescriptorPoolTestBase(object):
|
||||
self.pool.FindEnumTypeByName('Does not exist')
|
||||
|
||||
def testFindFieldByName(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix cpp extension to find field correctly
|
||||
# when descriptor pool is using an underlying database.
|
||||
return
|
||||
field = self.pool.FindFieldByName(
|
||||
'google.protobuf.python.internal.Factory1Message.list_value')
|
||||
self.assertEqual(field.name, 'list_value')
|
||||
@@ -290,11 +308,6 @@ class DescriptorPoolTestBase(object):
|
||||
self.pool.FindFieldByName('Does not exist')
|
||||
|
||||
def testFindOneofByName(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix cpp extension to find oneof correctly
|
||||
# when descriptor pool is using an underlying database.
|
||||
return
|
||||
oneof = self.pool.FindOneofByName(
|
||||
'google.protobuf.python.internal.Factory2Message.oneof_field')
|
||||
self.assertEqual(oneof.name, 'oneof_field')
|
||||
@@ -302,11 +315,6 @@ class DescriptorPoolTestBase(object):
|
||||
self.pool.FindOneofByName('Does not exist')
|
||||
|
||||
def testFindExtensionByName(self):
|
||||
if isinstance(self, SecondaryDescriptorFromDescriptorDB):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix cpp extension to find extension correctly
|
||||
# when descriptor pool is using an underlying database.
|
||||
return
|
||||
# An extension defined in a message.
|
||||
extension = self.pool.FindExtensionByName(
|
||||
'google.protobuf.python.internal.Factory2Message.one_more_field')
|
||||
@@ -326,12 +334,10 @@ class DescriptorPoolTestBase(object):
|
||||
'google.protobuf.python.internal.Factory2Message')
|
||||
# An extension defined in a message.
|
||||
one_more_field = factory2_message.extensions_by_name['one_more_field']
|
||||
self.pool.AddExtensionDescriptor(one_more_field)
|
||||
# An extension defined at file scope.
|
||||
factory_test2 = self.pool.FindFileByName(
|
||||
'google/protobuf/internal/factory_test2.proto')
|
||||
another_field = factory_test2.extensions_by_name['another_field']
|
||||
self.pool.AddExtensionDescriptor(another_field)
|
||||
|
||||
extensions = self.pool.FindAllExtensions(factory1_message)
|
||||
expected_extension_numbers = set([one_more_field, another_field])
|
||||
@@ -346,16 +352,9 @@ class DescriptorPoolTestBase(object):
|
||||
def testFindExtensionByNumber(self):
|
||||
factory1_message = self.pool.FindMessageTypeByName(
|
||||
'google.protobuf.python.internal.Factory1Message')
|
||||
factory2_message = self.pool.FindMessageTypeByName(
|
||||
'google.protobuf.python.internal.Factory2Message')
|
||||
# An extension defined in a message.
|
||||
one_more_field = factory2_message.extensions_by_name['one_more_field']
|
||||
self.pool.AddExtensionDescriptor(one_more_field)
|
||||
# An extension defined at file scope.
|
||||
factory_test2 = self.pool.FindFileByName(
|
||||
# Build factory_test2.proto which will put extensions to the pool
|
||||
self.pool.FindFileByName(
|
||||
'google/protobuf/internal/factory_test2.proto')
|
||||
another_field = factory_test2.extensions_by_name['another_field']
|
||||
self.pool.AddExtensionDescriptor(another_field)
|
||||
|
||||
# An extension defined in a message.
|
||||
extension = self.pool.FindExtensionByNumber(factory1_message, 1001)
|
||||
@@ -382,6 +381,11 @@ class DescriptorPoolTestBase(object):
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindServiceByName('Does not exist')
|
||||
|
||||
method = self.pool.FindMethodByName('protobuf_unittest.TestService.Foo')
|
||||
self.assertIs(method.containing_service, service)
|
||||
with self.assertRaises(KeyError):
|
||||
self.pool.FindMethodByName('protobuf_unittest.TestService.Doesnotexist')
|
||||
|
||||
def testUserDefinedDB(self):
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
self.pool = descriptor_pool.DescriptorPool(db)
|
||||
@@ -397,9 +401,19 @@ class DescriptorPoolTestBase(object):
|
||||
# TODO(jieluo): Fix python and cpp extension diff.
|
||||
return
|
||||
self.pool = descriptor_pool.DescriptorPool()
|
||||
self.pool.AddSerializedFile(self.factory_test1_fd.SerializeToString())
|
||||
self.pool.AddSerializedFile(self.factory_test2_fd.SerializeToString())
|
||||
file1 = self.pool.AddSerializedFile(
|
||||
self.factory_test1_fd.SerializeToString())
|
||||
file2 = self.pool.AddSerializedFile(
|
||||
self.factory_test2_fd.SerializeToString())
|
||||
self.assertEqual(file1.name,
|
||||
'google/protobuf/internal/factory_test1.proto')
|
||||
self.assertEqual(file2.name,
|
||||
'google/protobuf/internal/factory_test2.proto')
|
||||
self.testFindMessageTypeByName()
|
||||
file_json = self.pool.AddSerializedFile(
|
||||
more_messages_pb2.DESCRIPTOR.serialized_pb)
|
||||
field = file_json.message_types_by_name['class'].fields_by_name['int_field']
|
||||
self.assertEqual(field.json_name, 'json_int')
|
||||
|
||||
|
||||
def testEnumDefaultValue(self):
|
||||
@@ -514,41 +528,26 @@ class DescriptorPoolTestBase(object):
|
||||
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 = copy.deepcopy(self.pool)
|
||||
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'])
|
||||
pool.Add(unittest_fd)
|
||||
pool.Add(conflict_fd)
|
||||
pool.FindFileByName(unittest_fd.name)
|
||||
with self.assertRaises(TypeError):
|
||||
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))
|
||||
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class DefaultDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
@@ -584,6 +583,7 @@ class DefaultDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
unittest_pb2.DESCRIPTOR.services_by_name['TestService'])
|
||||
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class CreateDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
@@ -601,8 +601,11 @@ class CreateDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
|
||||
unittest_import_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
no_package_pb2.DESCRIPTOR.serialized_pb))
|
||||
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class SecondaryDescriptorFromDescriptorDB(DescriptorPoolTestBase,
|
||||
unittest.TestCase):
|
||||
|
||||
@@ -611,16 +614,86 @@ class SecondaryDescriptorFromDescriptorDB(DescriptorPoolTestBase,
|
||||
factory_test1_pb2.DESCRIPTOR.serialized_pb)
|
||||
self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
|
||||
factory_test2_pb2.DESCRIPTOR.serialized_pb)
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
db.Add(self.factory_test1_fd)
|
||||
db.Add(self.factory_test2_fd)
|
||||
db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
self.db = descriptor_database.DescriptorDatabase()
|
||||
self.db.Add(self.factory_test1_fd)
|
||||
self.db.Add(self.factory_test2_fd)
|
||||
self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
|
||||
db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_import_pb2.DESCRIPTOR.serialized_pb))
|
||||
db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
unittest_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool = descriptor_pool.DescriptorPool(descriptor_db=db)
|
||||
self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
|
||||
no_package_pb2.DESCRIPTOR.serialized_pb))
|
||||
self.pool = descriptor_pool.DescriptorPool(descriptor_db=self.db)
|
||||
|
||||
def testErrorCollector(self):
|
||||
file_proto = descriptor_pb2.FileDescriptorProto()
|
||||
file_proto.package = 'collector'
|
||||
file_proto.name = 'error_file'
|
||||
message_type = file_proto.message_type.add()
|
||||
message_type.name = 'ErrorMessage'
|
||||
field = message_type.field.add()
|
||||
field.number = 1
|
||||
field.name = 'nested_message_field'
|
||||
field.label = descriptor.FieldDescriptor.LABEL_OPTIONAL
|
||||
field.type = descriptor.FieldDescriptor.TYPE_MESSAGE
|
||||
field.type_name = 'SubMessage'
|
||||
oneof = message_type.oneof_decl.add()
|
||||
oneof.name = 'MyOneof'
|
||||
enum_type = file_proto.enum_type.add()
|
||||
enum_type.name = 'MyEnum'
|
||||
enum_value = enum_type.value.add()
|
||||
enum_value.name = 'MyEnumValue'
|
||||
enum_value.number = 0
|
||||
self.db.Add(file_proto)
|
||||
|
||||
self.assertRaisesRegexp(KeyError, 'SubMessage',
|
||||
self.pool.FindMessageTypeByName,
|
||||
'collector.ErrorMessage')
|
||||
self.assertRaisesRegexp(KeyError, 'SubMessage',
|
||||
self.pool.FindFileByName, 'error_file')
|
||||
with self.assertRaises(KeyError) as exc:
|
||||
self.pool.FindFileByName('none_file')
|
||||
self.assertIn(str(exc.exception), ('\'none_file\'',
|
||||
'\"Couldn\'t find file none_file\"'))
|
||||
|
||||
# Pure python _ConvertFileProtoToFileDescriptor() method has side effect
|
||||
# that all the symbols found in the file will load into the pool even the
|
||||
# file can not build. So when FindMessageTypeByName('ErrorMessage') was
|
||||
# called the first time, a KeyError will be raised but call the find
|
||||
# method later will return a descriptor which is not build.
|
||||
# TODO(jieluo): fix pure python to revert the load if file can not be build
|
||||
if api_implementation.Type() == 'cpp':
|
||||
error_msg = ('Invalid proto descriptor for file "error_file":\\n '
|
||||
'collector.ErrorMessage.nested_message_field: "SubMessage" '
|
||||
'is not defined.\\n collector.ErrorMessage.MyOneof: Oneof '
|
||||
'must have at least one field.\\n\'')
|
||||
with self.assertRaises(KeyError) as exc:
|
||||
self.pool.FindMessageTypeByName('collector.ErrorMessage')
|
||||
self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for '
|
||||
'message collector.ErrorMessage\\n' + error_msg)
|
||||
|
||||
with self.assertRaises(KeyError) as exc:
|
||||
self.pool.FindFieldByName('collector.ErrorMessage.nested_message_field')
|
||||
self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for field'
|
||||
' collector.ErrorMessage.nested_message_field\\n'
|
||||
+ error_msg)
|
||||
|
||||
with self.assertRaises(KeyError) as exc:
|
||||
self.pool.FindEnumTypeByName('collector.MyEnum')
|
||||
self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for enum'
|
||||
' collector.MyEnum\\n' + error_msg)
|
||||
|
||||
with self.assertRaises(KeyError) as exc:
|
||||
self.pool.FindFileContainingSymbol('collector.MyEnumValue')
|
||||
self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for symbol'
|
||||
' collector.MyEnumValue\\n' + error_msg)
|
||||
|
||||
with self.assertRaises(KeyError) as exc:
|
||||
self.pool.FindOneofByName('collector.ErrorMessage.MyOneof')
|
||||
self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for oneof'
|
||||
' collector.ErrorMessage.MyOneof\\n' + error_msg)
|
||||
|
||||
|
||||
class ProtoFile(object):
|
||||
@@ -746,11 +819,7 @@ class MessageField(object):
|
||||
test.assertEqual(msg_desc, field_desc.containing_type)
|
||||
test.assertEqual(field_type_desc, field_desc.message_type)
|
||||
test.assertEqual(file_desc, field_desc.file)
|
||||
# TODO(jieluo): Fix python and cpp extension diff for message field
|
||||
# default value.
|
||||
if api_implementation.Type() == 'cpp':
|
||||
test.assertRaises(
|
||||
NotImplementedError, getattr, field_desc, 'default_value')
|
||||
test.assertEqual(field_desc.default_value, None)
|
||||
|
||||
|
||||
class StringField(object):
|
||||
@@ -798,11 +867,12 @@ class ExtensionField(object):
|
||||
test.assertEqual(file_desc, field_desc.file)
|
||||
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class AddDescriptorTest(unittest.TestCase):
|
||||
|
||||
def _TestMessage(self, prefix):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
pool.AddDescriptor(unittest_pb2.TestAllTypes.DESCRIPTOR)
|
||||
pool._AddDescriptor(unittest_pb2.TestAllTypes.DESCRIPTOR)
|
||||
self.assertEqual(
|
||||
'protobuf_unittest.TestAllTypes',
|
||||
pool.FindMessageTypeByName(
|
||||
@@ -813,7 +883,7 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
pool.FindMessageTypeByName(
|
||||
prefix + 'protobuf_unittest.TestAllTypes.NestedMessage')
|
||||
|
||||
pool.AddDescriptor(unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR)
|
||||
pool._AddDescriptor(unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR)
|
||||
self.assertEqual(
|
||||
'protobuf_unittest.TestAllTypes.NestedMessage',
|
||||
pool.FindMessageTypeByName(
|
||||
@@ -838,7 +908,10 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
|
||||
def _TestEnum(self, prefix):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
pool.AddEnumDescriptor(unittest_pb2.ForeignEnum.DESCRIPTOR)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
pool.AddEnumDescriptor(unittest_pb2.ForeignEnum.DESCRIPTOR)
|
||||
else:
|
||||
pool._AddEnumDescriptor(unittest_pb2.ForeignEnum.DESCRIPTOR)
|
||||
self.assertEqual(
|
||||
'protobuf_unittest.ForeignEnum',
|
||||
pool.FindEnumTypeByName(
|
||||
@@ -849,7 +922,10 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
pool.FindEnumTypeByName(
|
||||
prefix + 'protobuf_unittest.ForeignEnum.NestedEnum')
|
||||
|
||||
pool.AddEnumDescriptor(unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
pool.AddEnumDescriptor(unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR)
|
||||
else:
|
||||
pool._AddEnumDescriptor(unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR)
|
||||
self.assertEqual(
|
||||
'protobuf_unittest.TestAllTypes.NestedEnum',
|
||||
pool.FindEnumTypeByName(
|
||||
@@ -878,7 +954,7 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
with self.assertRaises(KeyError):
|
||||
pool.FindServiceByName('protobuf_unittest.TestService')
|
||||
pool.AddServiceDescriptor(unittest_pb2._TESTSERVICE)
|
||||
pool._AddServiceDescriptor(unittest_pb2._TESTSERVICE)
|
||||
self.assertEqual(
|
||||
'protobuf_unittest.TestService',
|
||||
pool.FindServiceByName('protobuf_unittest.TestService').full_name)
|
||||
@@ -887,7 +963,7 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
'With the cpp implementation, Add() must be called first')
|
||||
def testFile(self):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
pool.AddFileDescriptor(unittest_pb2.DESCRIPTOR)
|
||||
pool._AddFileDescriptor(unittest_pb2.DESCRIPTOR)
|
||||
self.assertEqual(
|
||||
'google/protobuf/unittest.proto',
|
||||
pool.FindFileByName(
|
||||
@@ -961,16 +1037,28 @@ class AddDescriptorTest(unittest.TestCase):
|
||||
|
||||
def testAddTypeError(self):
|
||||
pool = descriptor_pool.DescriptorPool()
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddEnumDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddServiceDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddExtensionDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddFileDescriptor(0)
|
||||
if api_implementation.Type() == 'cpp':
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddEnumDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddServiceDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddExtensionDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool.AddFileDescriptor(0)
|
||||
else:
|
||||
with self.assertRaises(TypeError):
|
||||
pool._AddDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool._AddEnumDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool._AddServiceDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool._AddExtensionDescriptor(0)
|
||||
with self.assertRaises(TypeError):
|
||||
pool._AddFileDescriptor(0)
|
||||
|
||||
|
||||
TEST1_FILE = ProtoFile(
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/descriptor_pool_test1.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,461 +14,93 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ETA', index=0, number=7,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='THETA', index=1, number=8,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=738,
|
||||
serialized_end=770,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM)
|
||||
_DESCRIPTORPOOLTEST1 = DESCRIPTOR.message_types_by_name['DescriptorPoolTest1']
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE = _DESCRIPTORPOOLTEST1.nested_types_by_name['NestedMessage']
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE.nested_types_by_name['DeepNestedMessage']
|
||||
_DESCRIPTORPOOLTEST2 = DESCRIPTOR.message_types_by_name['DescriptorPoolTest2']
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE = _DESCRIPTORPOOLTEST2.nested_types_by_name['NestedMessage']
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE.nested_types_by_name['DeepNestedMessage']
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM = _DESCRIPTORPOOLTEST1.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM = _DESCRIPTORPOOLTEST2.enum_types_by_name['NestedEnum']
|
||||
DescriptorPoolTest1 = _reflection.GeneratedProtocolMessageType('DescriptorPoolTest1', (_message.Message,), {
|
||||
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='EPSILON', index=0, number=5,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ZETA', index=1, number=6,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=772,
|
||||
serialized_end=807,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM)
|
||||
'NestedMessage' : _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), {
|
||||
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ALPHA', index=0, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BETA', index=1, number=2,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=809,
|
||||
serialized_end=842,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST1_NESTEDENUM)
|
||||
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='LAMBDA', index=0, number=11,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='MU', index=1, number=12,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1506,
|
||||
serialized_end=1538,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM)
|
||||
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='IOTA', index=0, number=9,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='KAPPA', index=1, number=10,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1540,
|
||||
serialized_end=1573,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM)
|
||||
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='GAMMA', index=0, number=3,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='DELTA', index=1, number=4,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1575,
|
||||
serialized_end=1609,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST2_NESTEDENUM)
|
||||
|
||||
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='DeepNestedMessage',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=7,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=565,
|
||||
serialized_end=770,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='NestedMessage',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=6,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=298,
|
||||
serialized_end=807,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST1 = _descriptor.Descriptor(
|
||||
name='DescriptorPoolTest1',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest1',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest1.nested_enum', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST1_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1000, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=90,
|
||||
serialized_end=853,
|
||||
)
|
||||
|
||||
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='DeepNestedMessage',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=12,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1333,
|
||||
serialized_end=1538,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='NestedMessage',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=9,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1065,
|
||||
serialized_end=1573,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST2 = _descriptor.Descriptor(
|
||||
name='DescriptorPoolTest2',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest2',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest2.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=3,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST2_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=856,
|
||||
serialized_end=1609,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE.containing_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE.fields_by_name['deep_nested_message'].message_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE.containing_type = _DESCRIPTORPOOLTEST1
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST1.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST1_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST1.fields_by_name['nested_message'].message_type = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST1
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE.containing_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE.fields_by_name['deep_nested_message'].message_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE.containing_type = _DESCRIPTORPOOLTEST2
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST2.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST2_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST2.fields_by_name['nested_message'].message_type = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST2
|
||||
DESCRIPTOR.message_types_by_name['DescriptorPoolTest1'] = _DESCRIPTORPOOLTEST1
|
||||
DESCRIPTOR.message_types_by_name['DescriptorPoolTest2'] = _DESCRIPTORPOOLTEST2
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
DescriptorPoolTest1 = _reflection.GeneratedProtocolMessageType('DescriptorPoolTest1', (_message.Message,), dict(
|
||||
|
||||
NestedMessage = _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), dict(
|
||||
|
||||
DeepNestedMessage = _reflection.GeneratedProtocolMessageType('DeepNestedMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
'DeepNestedMessage' : _reflection.GeneratedProtocolMessageType('DeepNestedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage.DeepNestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST1_NESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST1_NESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest1.NestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST1,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST1,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest1)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest1)
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest1.NestedMessage)
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest1.NestedMessage.DeepNestedMessage)
|
||||
|
||||
DescriptorPoolTest2 = _reflection.GeneratedProtocolMessageType('DescriptorPoolTest2', (_message.Message,), dict(
|
||||
DescriptorPoolTest2 = _reflection.GeneratedProtocolMessageType('DescriptorPoolTest2', (_message.Message,), {
|
||||
|
||||
NestedMessage = _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), dict(
|
||||
'NestedMessage' : _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), {
|
||||
|
||||
DeepNestedMessage = _reflection.GeneratedProtocolMessageType('DeepNestedMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
'DeepNestedMessage' : _reflection.GeneratedProtocolMessageType('DeepNestedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage.DeepNestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST2_NESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST2_NESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest2.NestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST2,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST2,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest2)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest2)
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest2.NestedMessage)
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest2.NestedMessage.DeepNestedMessage)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_DESCRIPTORPOOLTEST1._serialized_start=90
|
||||
_DESCRIPTORPOOLTEST1._serialized_end=853
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE._serialized_start=298
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE._serialized_end=807
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE._serialized_start=565
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE._serialized_end=770
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM._serialized_start=738
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM._serialized_end=770
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM._serialized_start=772
|
||||
_DESCRIPTORPOOLTEST1_NESTEDMESSAGE_NESTEDENUM._serialized_end=807
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM._serialized_start=809
|
||||
_DESCRIPTORPOOLTEST1_NESTEDENUM._serialized_end=842
|
||||
_DESCRIPTORPOOLTEST2._serialized_start=856
|
||||
_DESCRIPTORPOOLTEST2._serialized_end=1609
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE._serialized_start=1065
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE._serialized_end=1573
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE._serialized_start=1333
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE._serialized_end=1538
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM._serialized_start=1506
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM._serialized_end=1538
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM._serialized_start=1540
|
||||
_DESCRIPTORPOOLTEST2_NESTEDMESSAGE_NESTEDENUM._serialized_end=1573
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM._serialized_start=1575
|
||||
_DESCRIPTORPOOLTEST2_NESTEDENUM._serialized_end=1609
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/descriptor_pool_test2.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -17,250 +17,53 @@ from google.protobuf.internal import more_messages_pb2 as google_dot_protobuf_do
|
||||
|
||||
from google.protobuf.internal.more_messages_pb2 import *
|
||||
|
||||
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,],
|
||||
public_dependencies=[google_dot_protobuf_dot_internal_dot_more__messages__pb2.DESCRIPTOR,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='RHO', index=0, number=17,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='SIGMA', index=1, number=18,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=832,
|
||||
serialized_end=864,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM)
|
||||
_DESCRIPTORPOOLTEST3 = DESCRIPTOR.message_types_by_name['DescriptorPoolTest3']
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE = _DESCRIPTORPOOLTEST3.nested_types_by_name['NestedMessage']
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE.nested_types_by_name['DeepNestedMessage']
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE.enum_types_by_name['NestedEnum']
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM = _DESCRIPTORPOOLTEST3.enum_types_by_name['NestedEnum']
|
||||
DescriptorPoolTest3 = _reflection.GeneratedProtocolMessageType('DescriptorPoolTest3', (_message.Message,), {
|
||||
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='OMICRON', index=0, number=15,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='PI', index=1, number=16,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=866,
|
||||
serialized_end=899,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM)
|
||||
'NestedMessage' : _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), {
|
||||
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NU', index=0, number=13,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='XI', index=1, number=14,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=901,
|
||||
serialized_end=929,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_DESCRIPTORPOOLTEST3_NESTEDENUM)
|
||||
|
||||
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='DeepNestedMessage',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=17,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=659,
|
||||
serialized_end=864,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='NestedMessage',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=16,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=396,
|
||||
serialized_end=899,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST3 = _descriptor.Descriptor(
|
||||
name='DescriptorPoolTest3',
|
||||
full_name='google.protobuf.python.internal.DescriptorPoolTest3',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='nested_enum', full_name='google.protobuf.python.internal.DescriptorPoolTest3.nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=True, default_value=14,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='descriptor_pool_test', full_name='google.protobuf.python.internal.DescriptorPoolTest3.descriptor_pool_test', index=0,
|
||||
number=1001, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_DESCRIPTORPOOLTEST3_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=190,
|
||||
serialized_end=1069,
|
||||
)
|
||||
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE.containing_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE.fields_by_name['deep_nested_message'].message_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE.containing_type = _DESCRIPTORPOOLTEST3
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST3.fields_by_name['nested_enum'].enum_type = _DESCRIPTORPOOLTEST3_NESTEDENUM
|
||||
_DESCRIPTORPOOLTEST3.fields_by_name['nested_message'].message_type = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM.containing_type = _DESCRIPTORPOOLTEST3
|
||||
DESCRIPTOR.message_types_by_name['DescriptorPoolTest3'] = _DESCRIPTORPOOLTEST3
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
DescriptorPoolTest3 = _reflection.GeneratedProtocolMessageType('DescriptorPoolTest3', (_message.Message,), dict(
|
||||
|
||||
NestedMessage = _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), dict(
|
||||
|
||||
DeepNestedMessage = _reflection.GeneratedProtocolMessageType('DeepNestedMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test2_pb2'
|
||||
'DeepNestedMessage' : _reflection.GeneratedProtocolMessageType('DeepNestedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage.DeepNestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST3_NESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test2_pb2'
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST3_NESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest3.NestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _DESCRIPTORPOOLTEST3,
|
||||
__module__ = 'google.protobuf.internal.descriptor_pool_test2_pb2'
|
||||
'DESCRIPTOR' : _DESCRIPTORPOOLTEST3,
|
||||
'__module__' : 'google.protobuf.internal.descriptor_pool_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.DescriptorPoolTest3)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest3)
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest3.NestedMessage)
|
||||
_sym_db.RegisterMessage(DescriptorPoolTest3.NestedMessage.DeepNestedMessage)
|
||||
|
||||
_DESCRIPTORPOOLTEST3.extensions_by_name['descriptor_pool_test'].message_type = _DESCRIPTORPOOLTEST3
|
||||
google_dot_protobuf_dot_internal_dot_descriptor__pool__test1__pb2.DescriptorPoolTest1.RegisterExtension(_DESCRIPTORPOOLTEST3.extensions_by_name['descriptor_pool_test'])
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
google_dot_protobuf_dot_internal_dot_descriptor__pool__test1__pb2.DescriptorPoolTest1.RegisterExtension(_DESCRIPTORPOOLTEST3.extensions_by_name['descriptor_pool_test'])
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_DESCRIPTORPOOLTEST3._serialized_start=190
|
||||
_DESCRIPTORPOOLTEST3._serialized_end=1069
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE._serialized_start=396
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE._serialized_end=899
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE._serialized_start=659
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE._serialized_end=864
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM._serialized_start=832
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_DEEPNESTEDMESSAGE_NESTEDENUM._serialized_end=864
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM._serialized_start=866
|
||||
_DESCRIPTORPOOLTEST3_NESTEDMESSAGE_NESTEDENUM._serialized_end=899
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM._serialized_start=901
|
||||
_DESCRIPTORPOOLTEST3_NESTEDENUM._serialized_end=929
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Executable → Regular
+33
-23
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -34,12 +32,8 @@
|
||||
|
||||
__author__ = 'robinson@google.com (Will Robinson)'
|
||||
|
||||
import sys
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
import warnings
|
||||
|
||||
from google.protobuf import unittest_custom_options_pb2
|
||||
from google.protobuf import unittest_import_pb2
|
||||
@@ -58,6 +52,9 @@ name: 'TestEmptyMessage'
|
||||
"""
|
||||
|
||||
|
||||
warnings.simplefilter('error', DeprecationWarning)
|
||||
|
||||
|
||||
class DescriptorTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
@@ -192,6 +189,14 @@ class DescriptorTest(unittest.TestCase):
|
||||
self.assertTrue(enum_value_descriptor.has_options)
|
||||
self.assertFalse(other_enum_value_descriptor.has_options)
|
||||
|
||||
def testCustomOptionsCopyTo(self):
|
||||
message_descriptor = (unittest_custom_options_pb2.
|
||||
TestMessageWithCustomOptions.DESCRIPTOR)
|
||||
message_proto = descriptor_pb2.DescriptorProto()
|
||||
message_descriptor.CopyToProto(message_proto)
|
||||
self.assertEqual(len(message_proto.options.ListFields()),
|
||||
2)
|
||||
|
||||
def testDifferentCustomOptionTypes(self):
|
||||
kint32min = -2**31
|
||||
kint64min = -2**63
|
||||
@@ -452,6 +457,17 @@ class DescriptorTest(unittest.TestCase):
|
||||
self.assertEqual('attribute is not writable: has_options',
|
||||
str(e.exception))
|
||||
|
||||
def testDefault(self):
|
||||
message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
field = message_descriptor.fields_by_name['repeated_int32']
|
||||
self.assertEqual(field.default_value, [])
|
||||
field = message_descriptor.fields_by_name['repeated_nested_message']
|
||||
self.assertEqual(field.default_value, [])
|
||||
field = message_descriptor.fields_by_name['optionalgroup']
|
||||
self.assertEqual(field.default_value, None)
|
||||
field = message_descriptor.fields_by_name['optional_nested_message']
|
||||
self.assertEqual(field.default_value, None)
|
||||
|
||||
|
||||
class NewDescriptorTest(DescriptorTest):
|
||||
"""Redo the same tests as above, but with a separate DescriptorPool."""
|
||||
@@ -559,10 +575,7 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
self.assertEqual(mapping, mapping)
|
||||
self.assertGreater(len(mapping), 0) # Sized
|
||||
self.assertEqual(len(mapping), len(excepted_dict)) # Iterable
|
||||
if sys.version_info >= (3,):
|
||||
key, item = next(iter(mapping.items()))
|
||||
else:
|
||||
key, item = mapping.items()[0]
|
||||
key, item = next(iter(mapping.items()))
|
||||
self.assertIn(key, mapping) # Container
|
||||
self.assertEqual(mapping.get(key), item)
|
||||
with self.assertRaises(TypeError):
|
||||
@@ -575,13 +588,6 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
# keys(), iterkeys() &co
|
||||
item = (next(iter(mapping.keys())), next(iter(mapping.values())))
|
||||
self.assertEqual(item, next(iter(mapping.items())))
|
||||
if sys.version_info < (3,):
|
||||
def CheckItems(seq, iterator):
|
||||
self.assertEqual(next(iterator), seq[0])
|
||||
self.assertEqual(list(iterator), seq[1:])
|
||||
CheckItems(mapping.keys(), mapping.iterkeys())
|
||||
CheckItems(mapping.values(), mapping.itervalues())
|
||||
CheckItems(mapping.items(), mapping.iteritems())
|
||||
excepted_dict[key] = 'change value'
|
||||
self.assertNotEqual(mapping, excepted_dict)
|
||||
del excepted_dict[key]
|
||||
@@ -631,6 +637,14 @@ class GeneratedDescriptorTest(unittest.TestCase):
|
||||
del enum
|
||||
self.assertEqual('FOO', next(values_iter).name)
|
||||
|
||||
def testDescriptorNestedTypesContainer(self):
|
||||
message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
nested_message_descriptor = unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR
|
||||
self.assertEqual(len(message_descriptor.nested_types), 3)
|
||||
self.assertFalse(None in message_descriptor.nested_types)
|
||||
self.assertTrue(
|
||||
nested_message_descriptor in message_descriptor.nested_types)
|
||||
|
||||
def testServiceDescriptor(self):
|
||||
service_descriptor = unittest_pb2.DESCRIPTOR.services_by_name['TestService']
|
||||
self.assertEqual(service_descriptor.name, 'TestService')
|
||||
@@ -876,10 +890,6 @@ class DescriptorCopyToProtoTest(unittest.TestCase):
|
||||
descriptor_pb2.ServiceDescriptorProto,
|
||||
TEST_SERVICE_ASCII)
|
||||
|
||||
@unittest.skipIf(
|
||||
api_implementation.Type() == 'python',
|
||||
'It is not implemented in python.')
|
||||
# TODO(jieluo): Add support for pure python or remove in c extension.
|
||||
def testCopyToProto_MethodDescriptor(self):
|
||||
expected_ascii = """
|
||||
name: 'Foo'
|
||||
|
||||
Executable → Regular
+9
-8
@@ -68,8 +68,6 @@ __author__ = 'kenton@google.com (Kenton Varda)'
|
||||
|
||||
import struct
|
||||
|
||||
import six
|
||||
|
||||
from google.protobuf.internal import wire_format
|
||||
|
||||
|
||||
@@ -372,14 +370,16 @@ def MapSizer(field_descriptor, is_message_map):
|
||||
def _VarintEncoder():
|
||||
"""Return an encoder for a basic varint value (does not include tag)."""
|
||||
|
||||
local_int2byte = struct.Struct('>B').pack
|
||||
|
||||
def EncodeVarint(write, value, unused_deterministic=None):
|
||||
bits = value & 0x7f
|
||||
value >>= 7
|
||||
while value:
|
||||
write(six.int2byte(0x80|bits))
|
||||
write(local_int2byte(0x80|bits))
|
||||
bits = value & 0x7f
|
||||
value >>= 7
|
||||
return write(six.int2byte(bits))
|
||||
return write(local_int2byte(bits))
|
||||
|
||||
return EncodeVarint
|
||||
|
||||
@@ -388,16 +388,18 @@ def _SignedVarintEncoder():
|
||||
"""Return an encoder for a basic signed varint value (does not include
|
||||
tag)."""
|
||||
|
||||
local_int2byte = struct.Struct('>B').pack
|
||||
|
||||
def EncodeSignedVarint(write, value, unused_deterministic=None):
|
||||
if value < 0:
|
||||
value += (1 << 64)
|
||||
bits = value & 0x7f
|
||||
value >>= 7
|
||||
while value:
|
||||
write(six.int2byte(0x80|bits))
|
||||
write(local_int2byte(0x80|bits))
|
||||
bits = value & 0x7f
|
||||
value >>= 7
|
||||
return write(six.int2byte(bits))
|
||||
return write(local_int2byte(bits))
|
||||
|
||||
return EncodeSignedVarint
|
||||
|
||||
@@ -418,8 +420,7 @@ 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 bytes(_VarintBytes(wire_format.PackTag(field_number, wire_type)))
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# As with sizers (see above), we have a number of common encoder
|
||||
|
||||
@@ -46,26 +46,38 @@ class EnumTypeWrapper(object):
|
||||
def __init__(self, enum_type):
|
||||
"""Inits EnumTypeWrapper with an EnumDescriptor."""
|
||||
self._enum_type = enum_type
|
||||
self.DESCRIPTOR = enum_type;
|
||||
self.DESCRIPTOR = enum_type # pylint: disable=invalid-name
|
||||
|
||||
def Name(self, number):
|
||||
def Name(self, number): # pylint: disable=invalid-name
|
||||
"""Returns a string containing the name of an enum value."""
|
||||
if number in self._enum_type.values_by_number:
|
||||
try:
|
||||
return self._enum_type.values_by_number[number].name
|
||||
raise ValueError('Enum %s has no name defined for value %d' % (
|
||||
self._enum_type.name, number))
|
||||
except KeyError:
|
||||
pass # fall out to break exception chaining
|
||||
|
||||
def Value(self, name):
|
||||
"""Returns the value coresponding to the given enum name."""
|
||||
if name in self._enum_type.values_by_name:
|
||||
if not isinstance(number, int):
|
||||
raise TypeError(
|
||||
'Enum value for {} must be an int, but got {} {!r}.'.format(
|
||||
self._enum_type.name, type(number), number))
|
||||
else:
|
||||
# repr here to handle the odd case when you pass in a boolean.
|
||||
raise ValueError('Enum {} has no name defined for value {!r}'.format(
|
||||
self._enum_type.name, number))
|
||||
|
||||
def Value(self, name): # pylint: disable=invalid-name
|
||||
"""Returns the value corresponding to the given enum name."""
|
||||
try:
|
||||
return self._enum_type.values_by_name[name].number
|
||||
raise ValueError('Enum %s has no value defined for name %s' % (
|
||||
except KeyError:
|
||||
pass # fall out to break exception chaining
|
||||
raise ValueError('Enum {} has no value defined for name {!r}'.format(
|
||||
self._enum_type.name, name))
|
||||
|
||||
def keys(self):
|
||||
"""Return a list of the string names in the enum.
|
||||
|
||||
These are returned in the order they were defined in the .proto file.
|
||||
Returns:
|
||||
A list of strs, in the order they were defined in the .proto file.
|
||||
"""
|
||||
|
||||
return [value_descriptor.name
|
||||
@@ -74,7 +86,8 @@ class EnumTypeWrapper(object):
|
||||
def values(self):
|
||||
"""Return a list of the integer values in the enum.
|
||||
|
||||
These are returned in the order they were defined in the .proto file.
|
||||
Returns:
|
||||
A list of ints, in the order they were defined in the .proto file.
|
||||
"""
|
||||
|
||||
return [value_descriptor.number
|
||||
@@ -83,7 +96,20 @@ class EnumTypeWrapper(object):
|
||||
def items(self):
|
||||
"""Return a list of the (name, value) pairs of the enum.
|
||||
|
||||
These are returned in the order they were defined in the .proto file.
|
||||
Returns:
|
||||
A list of (str, int) pairs, in the order they were defined
|
||||
in the .proto file.
|
||||
"""
|
||||
return [(value_descriptor.name, value_descriptor.number)
|
||||
for value_descriptor in self._enum_type.values]
|
||||
|
||||
def __getattr__(self, name):
|
||||
"""Returns the value corresponding to the given enum name."""
|
||||
try:
|
||||
return super(
|
||||
EnumTypeWrapper,
|
||||
self).__getattribute__('_enum_type').values_by_name[name].number
|
||||
except KeyError:
|
||||
pass # fall out to break exception chaining
|
||||
raise AttributeError('Enum {} has no value defined for name {!r}'.format(
|
||||
self._enum_type.name, name))
|
||||
@@ -0,0 +1,213 @@
|
||||
# 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.
|
||||
|
||||
"""Contains _ExtensionDict class to represent extensions.
|
||||
"""
|
||||
|
||||
from google.protobuf.internal import type_checkers
|
||||
from google.protobuf.descriptor import FieldDescriptor
|
||||
|
||||
|
||||
def _VerifyExtensionHandle(message, extension_handle):
|
||||
"""Verify that the given extension handle is valid."""
|
||||
|
||||
if not isinstance(extension_handle, FieldDescriptor):
|
||||
raise KeyError('HasExtension() expects an extension handle, got: %s' %
|
||||
extension_handle)
|
||||
|
||||
if not extension_handle.is_extension:
|
||||
raise KeyError('"%s" is not an extension.' % extension_handle.full_name)
|
||||
|
||||
if not extension_handle.containing_type:
|
||||
raise KeyError('"%s" is missing a containing_type.'
|
||||
% extension_handle.full_name)
|
||||
|
||||
if extension_handle.containing_type is not message.DESCRIPTOR:
|
||||
raise KeyError('Extension "%s" extends message type "%s", but this '
|
||||
'message is of type "%s".' %
|
||||
(extension_handle.full_name,
|
||||
extension_handle.containing_type.full_name,
|
||||
message.DESCRIPTOR.full_name))
|
||||
|
||||
|
||||
# TODO(robinson): Unify error handling of "unknown extension" crap.
|
||||
# TODO(robinson): Support iteritems()-style iteration over all
|
||||
# extensions with the "has" bits turned on?
|
||||
class _ExtensionDict(object):
|
||||
|
||||
"""Dict-like container for Extension fields on proto instances.
|
||||
|
||||
Note that in all cases we expect extension handles to be
|
||||
FieldDescriptors.
|
||||
"""
|
||||
|
||||
def __init__(self, extended_message):
|
||||
"""
|
||||
Args:
|
||||
extended_message: Message instance for which we are the Extensions dict.
|
||||
"""
|
||||
self._extended_message = extended_message
|
||||
|
||||
def __getitem__(self, extension_handle):
|
||||
"""Returns the current value of the given extension handle."""
|
||||
|
||||
_VerifyExtensionHandle(self._extended_message, extension_handle)
|
||||
|
||||
result = self._extended_message._fields.get(extension_handle)
|
||||
if result is not None:
|
||||
return result
|
||||
|
||||
if extension_handle.label == FieldDescriptor.LABEL_REPEATED:
|
||||
result = extension_handle._default_constructor(self._extended_message)
|
||||
elif extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
message_type = extension_handle.message_type
|
||||
if not hasattr(message_type, '_concrete_class'):
|
||||
# pylint: disable=protected-access
|
||||
self._extended_message._FACTORY.GetPrototype(message_type)
|
||||
assert getattr(extension_handle.message_type, '_concrete_class', None), (
|
||||
'Uninitialized concrete class found for field %r (message type %r)'
|
||||
% (extension_handle.full_name,
|
||||
extension_handle.message_type.full_name))
|
||||
result = extension_handle.message_type._concrete_class()
|
||||
try:
|
||||
result._SetListener(self._extended_message._listener_for_children)
|
||||
except ReferenceError:
|
||||
pass
|
||||
else:
|
||||
# Singular scalar -- just return the default without inserting into the
|
||||
# dict.
|
||||
return extension_handle.default_value
|
||||
|
||||
# Atomically check if another thread has preempted us and, if not, swap
|
||||
# in the new object we just created. If someone has preempted us, we
|
||||
# take that object and discard ours.
|
||||
# WARNING: We are relying on setdefault() being atomic. This is true
|
||||
# in CPython but we haven't investigated others. This warning appears
|
||||
# in several other locations in this file.
|
||||
result = self._extended_message._fields.setdefault(
|
||||
extension_handle, result)
|
||||
|
||||
return result
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, self.__class__):
|
||||
return False
|
||||
|
||||
my_fields = self._extended_message.ListFields()
|
||||
other_fields = other._extended_message.ListFields()
|
||||
|
||||
# Get rid of non-extension fields.
|
||||
my_fields = [field for field in my_fields if field.is_extension]
|
||||
other_fields = [field for field in other_fields if field.is_extension]
|
||||
|
||||
return my_fields == other_fields
|
||||
|
||||
def __ne__(self, other):
|
||||
return not self == other
|
||||
|
||||
def __len__(self):
|
||||
fields = self._extended_message.ListFields()
|
||||
# Get rid of non-extension fields.
|
||||
extension_fields = [field for field in fields if field[0].is_extension]
|
||||
return len(extension_fields)
|
||||
|
||||
def __hash__(self):
|
||||
raise TypeError('unhashable object')
|
||||
|
||||
# Note that this is only meaningful for non-repeated, scalar extension
|
||||
# fields. Note also that we may have to call _Modified() when we do
|
||||
# successfully set a field this way, to set any necessary "has" bits in the
|
||||
# ancestors of the extended message.
|
||||
def __setitem__(self, extension_handle, value):
|
||||
"""If extension_handle specifies a non-repeated, scalar extension
|
||||
field, sets the value of that field.
|
||||
"""
|
||||
|
||||
_VerifyExtensionHandle(self._extended_message, extension_handle)
|
||||
|
||||
if (extension_handle.label == FieldDescriptor.LABEL_REPEATED or
|
||||
extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE):
|
||||
raise TypeError(
|
||||
'Cannot assign to extension "%s" because it is a repeated or '
|
||||
'composite type.' % extension_handle.full_name)
|
||||
|
||||
# It's slightly wasteful to lookup the type checker each time,
|
||||
# but we expect this to be a vanishingly uncommon case anyway.
|
||||
type_checker = type_checkers.GetTypeChecker(extension_handle)
|
||||
# pylint: disable=protected-access
|
||||
self._extended_message._fields[extension_handle] = (
|
||||
type_checker.CheckValue(value))
|
||||
self._extended_message._Modified()
|
||||
|
||||
def __delitem__(self, extension_handle):
|
||||
self._extended_message.ClearExtension(extension_handle)
|
||||
|
||||
def _FindExtensionByName(self, name):
|
||||
"""Tries to find a known extension with the specified name.
|
||||
|
||||
Args:
|
||||
name: Extension full name.
|
||||
|
||||
Returns:
|
||||
Extension field descriptor.
|
||||
"""
|
||||
return self._extended_message._extensions_by_name.get(name, None)
|
||||
|
||||
def _FindExtensionByNumber(self, number):
|
||||
"""Tries to find a known extension with the field number.
|
||||
|
||||
Args:
|
||||
number: Extension field number.
|
||||
|
||||
Returns:
|
||||
Extension field descriptor.
|
||||
"""
|
||||
return self._extended_message._extensions_by_number.get(number, None)
|
||||
|
||||
def __iter__(self):
|
||||
# Return a generator over the populated extension fields
|
||||
return (f[0] for f in self._extended_message.ListFields()
|
||||
if f[0].is_extension)
|
||||
|
||||
def __contains__(self, extension_handle):
|
||||
_VerifyExtensionHandle(self._extended_message, extension_handle)
|
||||
|
||||
if extension_handle not in self._extended_message._fields:
|
||||
return False
|
||||
|
||||
if extension_handle.label == FieldDescriptor.LABEL_REPEATED:
|
||||
return bool(self._extended_message._fields.get(extension_handle))
|
||||
|
||||
if extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
value = self._extended_message._fields.get(extension_handle)
|
||||
# pylint: disable=protected-access
|
||||
return value is not None and value._is_present_in_parent
|
||||
|
||||
return True
|
||||
@@ -34,7 +34,6 @@ syntax = "proto2";
|
||||
|
||||
package google.protobuf.python.internal;
|
||||
|
||||
|
||||
enum Factory1Enum {
|
||||
FACTORY_1_VALUE_0 = 0;
|
||||
FACTORY_1_VALUE_1 = 1;
|
||||
@@ -56,3 +55,16 @@ message Factory1Message {
|
||||
|
||||
extensions 1000 to max;
|
||||
}
|
||||
|
||||
message Factory1MethodRequest {
|
||||
optional string argument = 1;
|
||||
}
|
||||
|
||||
message Factory1MethodResponse {
|
||||
optional string result = 1;
|
||||
}
|
||||
|
||||
service Factory1Service {
|
||||
// Dummy method for this dummy service.
|
||||
rpc Factory1Method(Factory1MethodRequest) returns (Factory1MethodResponse) {}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/factory_test1.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf.internal import enum_type_wrapper
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,176 +15,64 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
|
||||
_FACTORY1ENUM = _descriptor.EnumDescriptor(
|
||||
name='Factory1Enum',
|
||||
full_name='google.protobuf.python.internal.Factory1Enum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_1_VALUE_0', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_1_VALUE_1', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=553,
|
||||
serialized_end=613,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_FACTORY1ENUM)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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\x15\x46\x61\x63tory1MethodRequest\x12\x10\n\x08\x61rgument\x18\x01 \x01(\t\"(\n\x16\x46\x61\x63tory1MethodResponse\x12\x0e\n\x06result\x18\x01 \x01(\t*<\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\x32\x97\x01\n\x0f\x46\x61\x63tory1Service\x12\x83\x01\n\x0e\x46\x61\x63tory1Method\x12\x36.google.protobuf.python.internal.Factory1MethodRequest\x1a\x37.google.protobuf.python.internal.Factory1MethodResponse\"\x00')
|
||||
|
||||
_FACTORY1ENUM = DESCRIPTOR.enum_types_by_name['Factory1Enum']
|
||||
Factory1Enum = enum_type_wrapper.EnumTypeWrapper(_FACTORY1ENUM)
|
||||
FACTORY_1_VALUE_0 = 0
|
||||
FACTORY_1_VALUE_1 = 1
|
||||
|
||||
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedFactory1Enum',
|
||||
full_name='google.protobuf.python.internal.Factory1Message.NestedFactory1Enum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_1_VALUE_0', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_1_VALUE_1', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=460,
|
||||
serialized_end=540,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_FACTORY1MESSAGE_NESTEDFACTORY1ENUM)
|
||||
_FACTORY1MESSAGE = DESCRIPTOR.message_types_by_name['Factory1Message']
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE = _FACTORY1MESSAGE.nested_types_by_name['NestedFactory1Message']
|
||||
_FACTORY1METHODREQUEST = DESCRIPTOR.message_types_by_name['Factory1MethodRequest']
|
||||
_FACTORY1METHODRESPONSE = DESCRIPTOR.message_types_by_name['Factory1MethodResponse']
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM = _FACTORY1MESSAGE.enum_types_by_name['NestedFactory1Enum']
|
||||
Factory1Message = _reflection.GeneratedProtocolMessageType('Factory1Message', (_message.Message,), {
|
||||
|
||||
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE = _descriptor.Descriptor(
|
||||
name='NestedFactory1Message',
|
||||
full_name='google.protobuf.python.internal.Factory1Message.NestedFactory1Message',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.python.internal.Factory1Message.NestedFactory1Message.value', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=420,
|
||||
serialized_end=458,
|
||||
)
|
||||
|
||||
_FACTORY1MESSAGE = _descriptor.Descriptor(
|
||||
name='Factory1Message',
|
||||
full_name='google.protobuf.python.internal.Factory1Message',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='factory_1_enum', full_name='google.protobuf.python.internal.Factory1Message.factory_1_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),
|
||||
_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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE, ],
|
||||
enum_types=[
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1000, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=82,
|
||||
serialized_end=551,
|
||||
)
|
||||
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE.containing_type = _FACTORY1MESSAGE
|
||||
_FACTORY1MESSAGE.fields_by_name['factory_1_enum'].enum_type = _FACTORY1ENUM
|
||||
_FACTORY1MESSAGE.fields_by_name['nested_factory_1_enum'].enum_type = _FACTORY1MESSAGE_NESTEDFACTORY1ENUM
|
||||
_FACTORY1MESSAGE.fields_by_name['nested_factory_1_message'].message_type = _FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM.containing_type = _FACTORY1MESSAGE
|
||||
DESCRIPTOR.message_types_by_name['Factory1Message'] = _FACTORY1MESSAGE
|
||||
DESCRIPTOR.enum_types_by_name['Factory1Enum'] = _FACTORY1ENUM
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Factory1Message = _reflection.GeneratedProtocolMessageType('Factory1Message', (_message.Message,), dict(
|
||||
|
||||
NestedFactory1Message = _reflection.GeneratedProtocolMessageType('NestedFactory1Message', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE,
|
||||
__module__ = 'google.protobuf.internal.factory_test1_pb2'
|
||||
'NestedFactory1Message' : _reflection.GeneratedProtocolMessageType('NestedFactory1Message', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.factory_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory1Message.NestedFactory1Message)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _FACTORY1MESSAGE,
|
||||
__module__ = 'google.protobuf.internal.factory_test1_pb2'
|
||||
'DESCRIPTOR' : _FACTORY1MESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.factory_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory1Message)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Factory1Message)
|
||||
_sym_db.RegisterMessage(Factory1Message.NestedFactory1Message)
|
||||
|
||||
Factory1MethodRequest = _reflection.GeneratedProtocolMessageType('Factory1MethodRequest', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FACTORY1METHODREQUEST,
|
||||
'__module__' : 'google.protobuf.internal.factory_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory1MethodRequest)
|
||||
})
|
||||
_sym_db.RegisterMessage(Factory1MethodRequest)
|
||||
|
||||
Factory1MethodResponse = _reflection.GeneratedProtocolMessageType('Factory1MethodResponse', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FACTORY1METHODRESPONSE,
|
||||
'__module__' : 'google.protobuf.internal.factory_test1_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory1MethodResponse)
|
||||
})
|
||||
_sym_db.RegisterMessage(Factory1MethodResponse)
|
||||
|
||||
_FACTORY1SERVICE = DESCRIPTOR.services_by_name['Factory1Service']
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_FACTORY1ENUM._serialized_start=638
|
||||
_FACTORY1ENUM._serialized_end=698
|
||||
_FACTORY1MESSAGE._serialized_start=82
|
||||
_FACTORY1MESSAGE._serialized_end=551
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE._serialized_start=420
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE._serialized_end=458
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM._serialized_start=460
|
||||
_FACTORY1MESSAGE_NESTEDFACTORY1ENUM._serialized_end=540
|
||||
_FACTORY1METHODREQUEST._serialized_start=553
|
||||
_FACTORY1METHODREQUEST._serialized_end=594
|
||||
_FACTORY1METHODRESPONSE._serialized_start=596
|
||||
_FACTORY1METHODRESPONSE._serialized_end=636
|
||||
_FACTORY1SERVICE._serialized_start=701
|
||||
_FACTORY1SERVICE._serialized_end=852
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,10 +1,10 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/factory_test2.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf.internal import enum_type_wrapper
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -16,502 +16,91 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf.internal import factory_test1_pb2 as google_dot_protobuf_dot_internal_dot_factory__test1__pb2
|
||||
|
||||
|
||||
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,])
|
||||
|
||||
_FACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
name='Factory2Enum',
|
||||
full_name='google.protobuf.python.internal.Factory2Enum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_2_VALUE_0', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FACTORY_2_VALUE_1', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1816,
|
||||
serialized_end=1876,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_FACTORY2ENUM)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
_FACTORY2ENUM = DESCRIPTOR.enum_types_by_name['Factory2Enum']
|
||||
Factory2Enum = enum_type_wrapper.EnumTypeWrapper(_FACTORY2ENUM)
|
||||
FACTORY_2_VALUE_0 = 0
|
||||
FACTORY_2_VALUE_1 = 1
|
||||
|
||||
ANOTHER_FIELD_FIELD_NUMBER = 1002
|
||||
another_field = _descriptor.FieldDescriptor(
|
||||
name='another_field', full_name='google.protobuf.python.internal.another_field', index=0,
|
||||
number=1002, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
another_field = DESCRIPTOR.extensions_by_name['another_field']
|
||||
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedFactory2Enum',
|
||||
full_name='google.protobuf.python.internal.Factory2Message.NestedFactory2Enum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_2_VALUE_0', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_FACTORY_2_VALUE_1', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1454,
|
||||
serialized_end=1534,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_FACTORY2MESSAGE_NESTEDFACTORY2ENUM)
|
||||
_FACTORY2MESSAGE = DESCRIPTOR.message_types_by_name['Factory2Message']
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE = _FACTORY2MESSAGE.nested_types_by_name['NestedFactory2Message']
|
||||
_FACTORY2MESSAGE_GROUPED = _FACTORY2MESSAGE.nested_types_by_name['Grouped']
|
||||
_LOOPMESSAGE = DESCRIPTOR.message_types_by_name['LoopMessage']
|
||||
_MESSAGEWITHNESTEDENUMONLY = DESCRIPTOR.message_types_by_name['MessageWithNestedEnumOnly']
|
||||
_MESSAGEWITHOPTION = DESCRIPTOR.message_types_by_name['MessageWithOption']
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM = _FACTORY2MESSAGE.enum_types_by_name['NestedFactory2Enum']
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM = _MESSAGEWITHNESTEDENUMONLY.enum_types_by_name['NestedEnum']
|
||||
Factory2Message = _reflection.GeneratedProtocolMessageType('Factory2Message', (_message.Message,), {
|
||||
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.MessageWithNestedEnumOnly.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='NESTED_MESSAGE_ENUM_0', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=1734,
|
||||
serialized_end=1773,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM)
|
||||
|
||||
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE = _descriptor.Descriptor(
|
||||
name='NestedFactory2Message',
|
||||
full_name='google.protobuf.python.internal.Factory2Message.NestedFactory2Message',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.python.internal.Factory2Message.NestedFactory2Message.value', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1371,
|
||||
serialized_end=1409,
|
||||
)
|
||||
|
||||
_FACTORY2MESSAGE_GROUPED = _descriptor.Descriptor(
|
||||
name='Grouped',
|
||||
full_name='google.protobuf.python.internal.Factory2Message.Grouped',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='part_1', full_name='google.protobuf.python.internal.Factory2Message.Grouped.part_1', index=0,
|
||||
number=13, 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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1411,
|
||||
serialized_end=1452,
|
||||
)
|
||||
|
||||
_FACTORY2MESSAGE = _descriptor.Descriptor(
|
||||
name='Factory2Message',
|
||||
full_name='google.protobuf.python.internal.Factory2Message',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='mandatory', full_name='google.protobuf.python.internal.Factory2Message.mandatory', index=0,
|
||||
number=1, type=5, cpp_type=1, label=2,
|
||||
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),
|
||||
_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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='one_more_field', full_name='google.protobuf.python.internal.Factory2Message.one_more_field', index=0,
|
||||
number=1001, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE, _FACTORY2MESSAGE_GROUPED, ],
|
||||
enum_types=[
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
_descriptor.OneofDescriptor(
|
||||
name='oneof_field', full_name='google.protobuf.python.internal.Factory2Message.oneof_field',
|
||||
index=0, containing_type=None, fields=[]),
|
||||
],
|
||||
serialized_start=128,
|
||||
serialized_end=1624,
|
||||
)
|
||||
|
||||
|
||||
_LOOPMESSAGE = _descriptor.Descriptor(
|
||||
name='LoopMessage',
|
||||
full_name='google.protobuf.python.internal.LoopMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='loop', full_name='google.protobuf.python.internal.LoopMessage.loop', index=0,
|
||||
number=1, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1626,
|
||||
serialized_end=1703,
|
||||
)
|
||||
|
||||
|
||||
_MESSAGEWITHNESTEDENUMONLY = _descriptor.Descriptor(
|
||||
name='MessageWithNestedEnumOnly',
|
||||
full_name='google.protobuf.python.internal.MessageWithNestedEnumOnly',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1705,
|
||||
serialized_end=1773,
|
||||
)
|
||||
|
||||
|
||||
_MESSAGEWITHOPTION = _descriptor.Descriptor(
|
||||
name='MessageWithOption',
|
||||
full_name='google.protobuf.python.internal.MessageWithOption',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='field1', full_name='google.protobuf.python.internal.MessageWithOption.field1', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=_b('\020\001'),
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1775,
|
||||
serialized_end=1814,
|
||||
)
|
||||
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE.containing_type = _FACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE_GROUPED.containing_type = _FACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['factory_2_enum'].enum_type = _FACTORY2ENUM
|
||||
_FACTORY2MESSAGE.fields_by_name['nested_factory_2_enum'].enum_type = _FACTORY2MESSAGE_NESTEDFACTORY2ENUM
|
||||
_FACTORY2MESSAGE.fields_by_name['nested_factory_2_message'].message_type = _FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['factory_1_message'].message_type = google_dot_protobuf_dot_internal_dot_factory__test1__pb2._FACTORY1MESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['factory_1_enum'].enum_type = google_dot_protobuf_dot_internal_dot_factory__test1__pb2._FACTORY1ENUM
|
||||
_FACTORY2MESSAGE.fields_by_name['nested_factory_1_enum'].enum_type = google_dot_protobuf_dot_internal_dot_factory__test1__pb2._FACTORY1MESSAGE_NESTEDFACTORY1ENUM
|
||||
_FACTORY2MESSAGE.fields_by_name['nested_factory_1_message'].message_type = google_dot_protobuf_dot_internal_dot_factory__test1__pb2._FACTORY1MESSAGE_NESTEDFACTORY1MESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['circular_message'].message_type = _FACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['grouped'].message_type = _FACTORY2MESSAGE_GROUPED
|
||||
_FACTORY2MESSAGE.fields_by_name['loop'].message_type = _LOOPMESSAGE
|
||||
_FACTORY2MESSAGE.fields_by_name['enum_with_default'].enum_type = _FACTORY2ENUM
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM.containing_type = _FACTORY2MESSAGE
|
||||
_FACTORY2MESSAGE.oneofs_by_name['oneof_field'].fields.append(
|
||||
_FACTORY2MESSAGE.fields_by_name['oneof_int'])
|
||||
_FACTORY2MESSAGE.fields_by_name['oneof_int'].containing_oneof = _FACTORY2MESSAGE.oneofs_by_name['oneof_field']
|
||||
_FACTORY2MESSAGE.oneofs_by_name['oneof_field'].fields.append(
|
||||
_FACTORY2MESSAGE.fields_by_name['oneof_string'])
|
||||
_FACTORY2MESSAGE.fields_by_name['oneof_string'].containing_oneof = _FACTORY2MESSAGE.oneofs_by_name['oneof_field']
|
||||
_LOOPMESSAGE.fields_by_name['loop'].message_type = _FACTORY2MESSAGE
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM.containing_type = _MESSAGEWITHNESTEDENUMONLY
|
||||
DESCRIPTOR.message_types_by_name['Factory2Message'] = _FACTORY2MESSAGE
|
||||
DESCRIPTOR.message_types_by_name['LoopMessage'] = _LOOPMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['MessageWithNestedEnumOnly'] = _MESSAGEWITHNESTEDENUMONLY
|
||||
DESCRIPTOR.message_types_by_name['MessageWithOption'] = _MESSAGEWITHOPTION
|
||||
DESCRIPTOR.enum_types_by_name['Factory2Enum'] = _FACTORY2ENUM
|
||||
DESCRIPTOR.extensions_by_name['another_field'] = another_field
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Factory2Message = _reflection.GeneratedProtocolMessageType('Factory2Message', (_message.Message,), dict(
|
||||
|
||||
NestedFactory2Message = _reflection.GeneratedProtocolMessageType('NestedFactory2Message', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
'NestedFactory2Message' : _reflection.GeneratedProtocolMessageType('NestedFactory2Message', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory2Message.NestedFactory2Message)
|
||||
))
|
||||
})
|
||||
,
|
||||
|
||||
Grouped = _reflection.GeneratedProtocolMessageType('Grouped', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FACTORY2MESSAGE_GROUPED,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
'Grouped' : _reflection.GeneratedProtocolMessageType('Grouped', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FACTORY2MESSAGE_GROUPED,
|
||||
'__module__' : 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory2Message.Grouped)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _FACTORY2MESSAGE,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
'DESCRIPTOR' : _FACTORY2MESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.Factory2Message)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Factory2Message)
|
||||
_sym_db.RegisterMessage(Factory2Message.NestedFactory2Message)
|
||||
_sym_db.RegisterMessage(Factory2Message.Grouped)
|
||||
|
||||
LoopMessage = _reflection.GeneratedProtocolMessageType('LoopMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _LOOPMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
LoopMessage = _reflection.GeneratedProtocolMessageType('LoopMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _LOOPMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.LoopMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(LoopMessage)
|
||||
|
||||
MessageWithNestedEnumOnly = _reflection.GeneratedProtocolMessageType('MessageWithNestedEnumOnly', (_message.Message,), dict(
|
||||
DESCRIPTOR = _MESSAGEWITHNESTEDENUMONLY,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
MessageWithNestedEnumOnly = _reflection.GeneratedProtocolMessageType('MessageWithNestedEnumOnly', (_message.Message,), {
|
||||
'DESCRIPTOR' : _MESSAGEWITHNESTEDENUMONLY,
|
||||
'__module__' : 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.MessageWithNestedEnumOnly)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(MessageWithNestedEnumOnly)
|
||||
|
||||
MessageWithOption = _reflection.GeneratedProtocolMessageType('MessageWithOption', (_message.Message,), dict(
|
||||
DESCRIPTOR = _MESSAGEWITHOPTION,
|
||||
__module__ = 'google.protobuf.internal.factory_test2_pb2'
|
||||
MessageWithOption = _reflection.GeneratedProtocolMessageType('MessageWithOption', (_message.Message,), {
|
||||
'DESCRIPTOR' : _MESSAGEWITHOPTION,
|
||||
'__module__' : 'google.protobuf.internal.factory_test2_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.MessageWithOption)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(MessageWithOption)
|
||||
|
||||
google_dot_protobuf_dot_internal_dot_factory__test1__pb2.Factory1Message.RegisterExtension(another_field)
|
||||
google_dot_protobuf_dot_internal_dot_factory__test1__pb2.Factory1Message.RegisterExtension(_FACTORY2MESSAGE.extensions_by_name['one_more_field'])
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
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._options = None
|
||||
DESCRIPTOR._options = None
|
||||
_MESSAGEWITHOPTION._options = None
|
||||
_MESSAGEWITHOPTION._serialized_options = b'\020\001'
|
||||
_FACTORY2ENUM._serialized_start=1816
|
||||
_FACTORY2ENUM._serialized_end=1876
|
||||
_FACTORY2MESSAGE._serialized_start=128
|
||||
_FACTORY2MESSAGE._serialized_end=1624
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE._serialized_start=1371
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2MESSAGE._serialized_end=1409
|
||||
_FACTORY2MESSAGE_GROUPED._serialized_start=1411
|
||||
_FACTORY2MESSAGE_GROUPED._serialized_end=1452
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM._serialized_start=1454
|
||||
_FACTORY2MESSAGE_NESTEDFACTORY2ENUM._serialized_end=1534
|
||||
_LOOPMESSAGE._serialized_start=1626
|
||||
_LOOPMESSAGE._serialized_end=1703
|
||||
_MESSAGEWITHNESTEDENUMONLY._serialized_start=1705
|
||||
_MESSAGEWITHNESTEDENUMONLY._serialized_end=1773
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM._serialized_start=1734
|
||||
_MESSAGEWITHNESTEDENUMONLY_NESTEDENUM._serialized_end=1773
|
||||
_MESSAGEWITHOPTION._serialized_start=1775
|
||||
_MESSAGEWITHOPTION._serialized_end=1814
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/file_options_test.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,68 +15,24 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
FOO_OPTIONS_FIELD_NUMBER = 120436268
|
||||
foo_options = _descriptor.FieldDescriptor(
|
||||
name='foo_options', full_name='google.protobuf.python.internal.foo_options', index=0,
|
||||
number=120436268, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
foo_options = DESCRIPTOR.extensions_by_name['foo_options']
|
||||
|
||||
|
||||
_FOOOPTIONS = _descriptor.Descriptor(
|
||||
name='FooOptions',
|
||||
full_name='google.protobuf.python.internal.FooOptions',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='foo_name', full_name='google.protobuf.python.internal.FooOptions.foo_name', index=0,
|
||||
number=1, type=9, cpp_type=9, label=1,
|
||||
has_default_value=False, default_value=_b("").decode('utf-8'),
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=119,
|
||||
serialized_end=149,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['FooOptions'] = _FOOOPTIONS
|
||||
DESCRIPTOR.extensions_by_name['foo_options'] = foo_options
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
FooOptions = _reflection.GeneratedProtocolMessageType('FooOptions', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FOOOPTIONS,
|
||||
__module__ = 'google.protobuf.internal.file_options_test_pb2'
|
||||
_FOOOPTIONS = DESCRIPTOR.message_types_by_name['FooOptions']
|
||||
FooOptions = _reflection.GeneratedProtocolMessageType('FooOptions', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FOOOPTIONS,
|
||||
'__module__' : 'google.protobuf.internal.file_options_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.FooOptions)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(FooOptions)
|
||||
|
||||
foo_options.message_type = _FOOOPTIONS
|
||||
google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(foo_options)
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(foo_options)
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_FOOOPTIONS._serialized_start=119
|
||||
_FOOOPTIONS._serialized_end=149
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Executable → Regular
+10
-2
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -306,6 +304,16 @@ class GeneratorTest(unittest.TestCase):
|
||||
else:
|
||||
self.assertIsNone(field_desc.containing_oneof)
|
||||
|
||||
def testEnumWithDupValue(self):
|
||||
self.assertEqual('FOO1',
|
||||
unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.FOO1))
|
||||
self.assertEqual('FOO1',
|
||||
unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.FOO2))
|
||||
self.assertEqual('BAR1',
|
||||
unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.BAR1))
|
||||
self.assertEqual('BAR1',
|
||||
unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.BAR2))
|
||||
|
||||
|
||||
class SymbolDatabaseRegistrationTest(unittest.TestCase):
|
||||
"""Checks that messages, enums and files are correctly registered."""
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/import_test_package/inner.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,56 +14,21 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
|
||||
_INNER = _descriptor.Descriptor(
|
||||
name='Inner',
|
||||
full_name='google.protobuf.python.internal.import_test_package.Inner',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='value', full_name='google.protobuf.python.internal.import_test_package.Inner.value', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=True, default_value=57,
|
||||
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=113,
|
||||
serialized_end=139,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['Inner'] = _INNER
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Inner = _reflection.GeneratedProtocolMessageType('Inner', (_message.Message,), dict(
|
||||
DESCRIPTOR = _INNER,
|
||||
__module__ = 'google.protobuf.internal.import_test_package.inner_pb2'
|
||||
_INNER = DESCRIPTOR.message_types_by_name['Inner']
|
||||
Inner = _reflection.GeneratedProtocolMessageType('Inner', (_message.Message,), {
|
||||
'DESCRIPTOR' : _INNER,
|
||||
'__module__' : 'google.protobuf.internal.import_test_package.inner_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.import_test_package.Inner)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Inner)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_INNER._serialized_start=113
|
||||
_INNER._serialized_end=139
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/import_test_package/outer.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,58 +15,21 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf.internal.import_test_package import inner_pb2 as google_dot_protobuf_dot_internal_dot_import__test__package_dot_inner__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
|
||||
_OUTER = _descriptor.Descriptor(
|
||||
name='Outer',
|
||||
full_name='google.protobuf.python.internal.import_test_package.Outer',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='inner', full_name='google.protobuf.python.internal.import_test_package.Outer.inner', index=0,
|
||||
number=1, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=171,
|
||||
serialized_end=253,
|
||||
)
|
||||
|
||||
_OUTER.fields_by_name['inner'].message_type = google_dot_protobuf_dot_internal_dot_import__test__package_dot_inner__pb2._INNER
|
||||
DESCRIPTOR.message_types_by_name['Outer'] = _OUTER
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
Outer = _reflection.GeneratedProtocolMessageType('Outer', (_message.Message,), dict(
|
||||
DESCRIPTOR = _OUTER,
|
||||
__module__ = 'google.protobuf.internal.import_test_package.outer_pb2'
|
||||
_OUTER = DESCRIPTOR.message_types_by_name['Outer']
|
||||
Outer = _reflection.GeneratedProtocolMessageType('Outer', (_message.Message,), {
|
||||
'DESCRIPTOR' : _OUTER,
|
||||
'__module__' : 'google.protobuf.internal.import_test_package.outer_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.import_test_package.Outer)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(Outer)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_OUTER._serialized_start=171
|
||||
_OUTER._serialized_end=253
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -36,12 +34,9 @@ __author__ = 'jieluo@google.com (Jie Luo)'
|
||||
|
||||
import json
|
||||
import math
|
||||
import sys
|
||||
import struct
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
from google.protobuf import any_pb2
|
||||
from google.protobuf import duration_pb2
|
||||
@@ -49,10 +44,13 @@ from google.protobuf import field_mask_pb2
|
||||
from google.protobuf import struct_pb2
|
||||
from google.protobuf import timestamp_pb2
|
||||
from google.protobuf import wrappers_pb2
|
||||
from google.protobuf import any_test_pb2
|
||||
from google.protobuf import unittest_mset_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf.internal import well_known_types
|
||||
from google.protobuf.internal import test_proto3_optional_pb2
|
||||
from google.protobuf import descriptor_pool
|
||||
from google.protobuf import json_format
|
||||
from google.protobuf.util import json_format_pb2
|
||||
from google.protobuf.util import json_format_proto3_pb2
|
||||
|
||||
|
||||
@@ -200,6 +198,27 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.ParseDict(message_dict, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
|
||||
def testExtensionToDictAndBackWithScalar(self):
|
||||
message = unittest_pb2.TestAllExtensions()
|
||||
ext1 = unittest_pb2.TestNestedExtension.test
|
||||
message.Extensions[ext1] = 'data'
|
||||
message_dict = json_format.MessageToDict(
|
||||
message
|
||||
)
|
||||
parsed_message = unittest_pb2.TestAllExtensions()
|
||||
json_format.ParseDict(message_dict, parsed_message)
|
||||
self.assertEqual(message, parsed_message)
|
||||
|
||||
def testJsonParseDictToAnyDoesNotAlterInput(self):
|
||||
orig_dict = {
|
||||
'int32Value': 20,
|
||||
'@type': 'type.googleapis.com/proto3.TestMessage'
|
||||
}
|
||||
copied_dict = json.loads(json.dumps(orig_dict))
|
||||
parsed_message = any_pb2.Any()
|
||||
json_format.ParseDict(copied_dict, parsed_message)
|
||||
self.assertEqual(copied_dict, orig_dict)
|
||||
|
||||
def testExtensionSerializationDictMatchesProto3Spec(self):
|
||||
"""See go/proto3-json-spec for spec.
|
||||
"""
|
||||
@@ -214,17 +233,35 @@ class JsonFormatTest(JsonFormatBase):
|
||||
golden_dict = {
|
||||
'messageSet': {
|
||||
'[protobuf_unittest.'
|
||||
'TestMessageSetExtension1.messageSetExtension]': {
|
||||
'TestMessageSetExtension1.message_set_extension]': {
|
||||
'i': 23,
|
||||
},
|
||||
'[protobuf_unittest.'
|
||||
'TestMessageSetExtension2.messageSetExtension]': {
|
||||
'TestMessageSetExtension2.message_set_extension]': {
|
||||
'str': u'foo',
|
||||
},
|
||||
},
|
||||
}
|
||||
self.assertEqual(golden_dict, message_dict)
|
||||
parsed_msg = unittest_mset_pb2.TestMessageSetContainer()
|
||||
json_format.ParseDict(golden_dict, parsed_msg)
|
||||
self.assertEqual(message, parsed_msg)
|
||||
|
||||
def testExtensionSerializationDictMatchesProto3SpecMore(self):
|
||||
"""See go/proto3-json-spec for spec.
|
||||
"""
|
||||
message = json_format_pb2.TestMessageWithExtension()
|
||||
ext = json_format_pb2.TestExtension.ext
|
||||
message.Extensions[ext].value = 'stuff'
|
||||
message_dict = json_format.MessageToDict(
|
||||
message
|
||||
)
|
||||
expected_dict = {
|
||||
'[protobuf_unittest.TestExtension.ext]': {
|
||||
'value': u'stuff',
|
||||
},
|
||||
}
|
||||
self.assertEqual(expected_dict, message_dict)
|
||||
|
||||
def testExtensionSerializationJsonMatchesProto3Spec(self):
|
||||
"""See go/proto3-json-spec for spec.
|
||||
@@ -238,9 +275,9 @@ class JsonFormatTest(JsonFormatBase):
|
||||
message
|
||||
)
|
||||
ext1_text = ('protobuf_unittest.TestMessageSetExtension1.'
|
||||
'messageSetExtension')
|
||||
'message_set_extension')
|
||||
ext2_text = ('protobuf_unittest.TestMessageSetExtension2.'
|
||||
'messageSetExtension')
|
||||
'message_set_extension')
|
||||
golden_text = ('{"messageSet": {'
|
||||
' "[%s]": {'
|
||||
' "i": 23'
|
||||
@@ -251,14 +288,10 @@ class JsonFormatTest(JsonFormatBase):
|
||||
'}}') % (ext1_text, ext2_text)
|
||||
self.assertEqual(json.loads(golden_text), json.loads(message_text))
|
||||
|
||||
|
||||
def testJsonEscapeString(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
if sys.version_info[0] < 3:
|
||||
message.string_value = '&\n<\"\r>\b\t\f\\\001/\xe2\x80\xa8\xe2\x80\xa9'
|
||||
else:
|
||||
message.string_value = '&\n<\"\r>\b\t\f\\\001/'
|
||||
message.string_value += (b'\xe2\x80\xa8\xe2\x80\xa9').decode('utf-8')
|
||||
message.string_value = '&\n<\"\r>\b\t\f\\\001/'
|
||||
message.string_value += (b'\xe2\x80\xa8\xe2\x80\xa9').decode('utf-8')
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message),
|
||||
'{\n "stringValue": '
|
||||
@@ -299,6 +332,20 @@ class JsonFormatTest(JsonFormatBase):
|
||||
parsed_message = json_format_proto3_pb2.TestMessage()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
|
||||
def testProto3Optional(self):
|
||||
message = test_proto3_optional_pb2.TestProto3Optional()
|
||||
self.assertEqual(
|
||||
json.loads(
|
||||
json_format.MessageToJson(
|
||||
message, including_default_value_fields=True)),
|
||||
json.loads('{}'))
|
||||
message.optional_int32 = 0
|
||||
self.assertEqual(
|
||||
json.loads(
|
||||
json_format.MessageToJson(
|
||||
message, including_default_value_fields=True)),
|
||||
json.loads('{"optionalInt32": 0}'))
|
||||
|
||||
def testIntegersRepresentedAsFloat(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
json_format.Parse('{"int32Value": -2.147483648e9}', message)
|
||||
@@ -458,6 +505,14 @@ class JsonFormatTest(JsonFormatBase):
|
||||
parsed_message = json_format_proto3_pb2.TestFieldMask()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
|
||||
message.value.Clear()
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message, True),
|
||||
'{\n'
|
||||
' "value": ""\n'
|
||||
'}')
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
|
||||
def testWrapperMessage(self):
|
||||
message = json_format_proto3_pb2.TestWrapper()
|
||||
message.bool_value.value = False
|
||||
@@ -495,6 +550,8 @@ class JsonFormatTest(JsonFormatBase):
|
||||
message.value['email'] = None
|
||||
message.value.get_or_create_struct('address')['city'] = 'SFO'
|
||||
message.value['address']['house_number'] = 1024
|
||||
message.value.get_or_create_struct('empty_struct')
|
||||
message.value.get_or_create_list('empty_list')
|
||||
struct_list = message.value.get_or_create_list('list')
|
||||
struct_list.extend([6, 'seven', True, False, None])
|
||||
struct_list.add_struct()['subkey2'] = 9
|
||||
@@ -509,6 +566,8 @@ class JsonFormatTest(JsonFormatBase):
|
||||
' "city": "SFO", '
|
||||
' "house_number": 1024'
|
||||
' }, '
|
||||
' "empty_struct": {}, '
|
||||
' "empty_list": [], '
|
||||
' "age": 10, '
|
||||
' "name": "Jim", '
|
||||
' "attend": true, '
|
||||
@@ -519,6 +578,9 @@ class JsonFormatTest(JsonFormatBase):
|
||||
'}'))
|
||||
parsed_message = json_format_proto3_pb2.TestStruct()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
# check for regression; this used to raise
|
||||
parsed_message.value['empty_struct']
|
||||
parsed_message.value['empty_list']
|
||||
|
||||
def testValueMessage(self):
|
||||
message = json_format_proto3_pb2.TestValue()
|
||||
@@ -565,6 +627,20 @@ class JsonFormatTest(JsonFormatBase):
|
||||
parsed_message = json_format_proto3_pb2.TestListValue()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
|
||||
def testNullValue(self):
|
||||
message = json_format_proto3_pb2.TestOneof()
|
||||
message.oneof_null_value = 0
|
||||
self.assertEqual(json_format.MessageToJson(message),
|
||||
'{\n "oneofNullValue": null\n}')
|
||||
parsed_message = json_format_proto3_pb2.TestOneof()
|
||||
self.CheckParseBack(message, parsed_message)
|
||||
# Check old format is also accepted
|
||||
new_message = json_format_proto3_pb2.TestOneof()
|
||||
json_format.Parse('{\n "oneofNullValue": "NULL_VALUE"\n}',
|
||||
new_message)
|
||||
self.assertEqual(json_format.MessageToJson(new_message),
|
||||
'{\n "oneofNullValue": null\n}')
|
||||
|
||||
def testAnyMessage(self):
|
||||
message = json_format_proto3_pb2.TestAny()
|
||||
value1 = json_format_proto3_pb2.MessageType()
|
||||
@@ -611,6 +687,19 @@ class JsonFormatTest(JsonFormatBase):
|
||||
' "value": {\n'
|
||||
' "@type": "type.googleapis.com/proto3.TestMessage"')
|
||||
|
||||
def testAnyMessageDescriptorPoolMissingType(self):
|
||||
packed_message = unittest_pb2.OneString()
|
||||
packed_message.data = 'string'
|
||||
message = any_test_pb2.TestAny()
|
||||
message.any_value.Pack(packed_message)
|
||||
empty_pool = descriptor_pool.DescriptorPool()
|
||||
with self.assertRaises(TypeError) as cm:
|
||||
json_format.MessageToJson(message, True, descriptor_pool=empty_pool)
|
||||
self.assertEqual(
|
||||
'Can not find message descriptor by type_url:'
|
||||
' type.googleapis.com/protobuf_unittest.OneString.',
|
||||
str(cm.exception))
|
||||
|
||||
def testWellKnownInAnyMessage(self):
|
||||
message = any_pb2.Any()
|
||||
int32_value = wrappers_pb2.Int32Value()
|
||||
@@ -744,6 +833,55 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.Parse(text, parsed_message)
|
||||
self.assertTrue(math.isnan(parsed_message.float_value))
|
||||
|
||||
def testParseDoubleToFloat(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
text = ('{"repeatedDoubleValue": [3.4028235e+39, 1.4028235e-39]\n}')
|
||||
json_format.Parse(text, message)
|
||||
self.assertEqual(message.repeated_double_value[0], 3.4028235e+39)
|
||||
self.assertEqual(message.repeated_double_value[1], 1.4028235e-39)
|
||||
text = ('{"repeatedFloatValue": [3.4028235e+39, 1.4028235e-39]\n}')
|
||||
self.CheckError(text,
|
||||
'Failed to parse repeatedFloatValue field: '
|
||||
'Float value too large.')
|
||||
|
||||
def testFloatPrecision(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
message.float_value = 1.123456789
|
||||
# Set to 8 valid digits.
|
||||
text = '{\n "floatValue": 1.1234568\n}'
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message, float_precision=8), text)
|
||||
# Set to 7 valid digits.
|
||||
text = '{\n "floatValue": 1.123457\n}'
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message, float_precision=7), text)
|
||||
|
||||
# Default float_precision will automatic print shortest float.
|
||||
message.float_value = 1.1000000011
|
||||
text = '{\n "floatValue": 1.1\n}'
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message), text)
|
||||
message.float_value = 1.00000075e-36
|
||||
text = '{\n "floatValue": 1.00000075e-36\n}'
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message), text)
|
||||
message.float_value = 12345678912345e+11
|
||||
text = '{\n "floatValue": 1.234568e+24\n}'
|
||||
self.assertEqual(
|
||||
json_format.MessageToJson(message), text)
|
||||
|
||||
# Test a bunch of data and check json encode/decode do not
|
||||
# lose precision
|
||||
value_list = [0x00, 0xD8, 0x6E, 0x00]
|
||||
msg2 = json_format_proto3_pb2.TestMessage()
|
||||
for a in range(0, 256):
|
||||
value_list[3] = a
|
||||
for b in range(0, 256):
|
||||
value_list[0] = b
|
||||
byte_array = bytearray(value_list)
|
||||
message.float_value = struct.unpack('<f', byte_array)[0]
|
||||
self.CheckParseBack(message, msg2)
|
||||
|
||||
def testParseEmptyText(self):
|
||||
self.CheckError('',
|
||||
r'Failed to load JSON: (Expecting value)|(No JSON).')
|
||||
@@ -769,6 +907,23 @@ class JsonFormatTest(JsonFormatBase):
|
||||
'for enum type protobuf_unittest.TestAllTypes.NestedEnum.',
|
||||
json_format.Parse, '{"optionalNestedEnum": 12345}', message)
|
||||
|
||||
def testBytes(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
# Test url base64
|
||||
text = '{"bytesValue": "-_"}'
|
||||
json_format.Parse(text, message)
|
||||
self.assertEqual(message.bytes_value, b'\xfb')
|
||||
# Test padding
|
||||
text = '{"bytesValue": "AQI="}'
|
||||
json_format.Parse(text, message)
|
||||
self.assertEqual(message.bytes_value, b'\x01\x02')
|
||||
text = '{"bytesValue": "AQI"}'
|
||||
json_format.Parse(text, message)
|
||||
self.assertEqual(message.bytes_value, b'\x01\x02')
|
||||
text = '{"bytesValue": "AQI*"}'
|
||||
json_format.Parse(text, message)
|
||||
self.assertEqual(message.bytes_value, b'\x01\x02')
|
||||
|
||||
def testParseBadIdentifer(self):
|
||||
self.CheckError('{int32Value: 1}',
|
||||
(r'Failed to load JSON: Expecting property name'
|
||||
@@ -791,9 +946,6 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.Parse(text, parsed_message, ignore_unknown_fields=True)
|
||||
|
||||
def testDuplicateField(self):
|
||||
# Duplicate key check is not supported for python2.6
|
||||
if sys.version_info < (2, 7):
|
||||
return
|
||||
self.CheckError('{"int32Value": 1,\n"int32Value":2}',
|
||||
'Failed to load JSON: duplicate key int32Value.')
|
||||
|
||||
@@ -822,6 +974,9 @@ class JsonFormatTest(JsonFormatBase):
|
||||
self.CheckError('{"int32Value": "1 "}',
|
||||
'Failed to parse int32Value field: '
|
||||
'Couldn\'t parse integer: "1 ".')
|
||||
self.CheckError('{"int32Value": false}',
|
||||
'Failed to parse int32Value field: Bool value False '
|
||||
'is not acceptable for integer field.')
|
||||
self.CheckError('{"int32Value": 12345678901234567890}',
|
||||
'Failed to parse int32Value field: Value out of range: '
|
||||
'12345678901234567890.')
|
||||
@@ -833,12 +988,24 @@ class JsonFormatTest(JsonFormatBase):
|
||||
self.CheckError('{"floatValue": "nan"}',
|
||||
'Failed to parse floatValue field: Couldn\'t '
|
||||
'parse float "nan", use "NaN" instead.')
|
||||
|
||||
def testInvalidBytesValue(self):
|
||||
self.CheckError('{"bytesValue": "AQI"}',
|
||||
'Failed to parse bytesValue field: Incorrect padding.')
|
||||
self.CheckError('{"bytesValue": "AQI*"}',
|
||||
'Failed to parse bytesValue field: Incorrect padding.')
|
||||
self.CheckError('{"floatValue": NaN}',
|
||||
'Failed to parse floatValue field: Couldn\'t '
|
||||
'parse NaN, use quoted "NaN" instead.')
|
||||
self.CheckError('{"floatValue": Infinity}',
|
||||
'Failed to parse floatValue field: Couldn\'t parse Infinity'
|
||||
' or value too large, use quoted "Infinity" instead.')
|
||||
self.CheckError('{"floatValue": -Infinity}',
|
||||
'Failed to parse floatValue field: Couldn\'t parse '
|
||||
'-Infinity or value too small, '
|
||||
'use quoted "-Infinity" instead.')
|
||||
self.CheckError('{"doubleValue": -1.89769e+308}',
|
||||
'Failed to parse doubleValue field: Couldn\'t parse '
|
||||
'-Infinity or value too small, '
|
||||
'use quoted "-Infinity" instead.')
|
||||
self.CheckError('{"floatValue": 3.4028235e+39}',
|
||||
'Failed to parse floatValue field: Float value too large.')
|
||||
self.CheckError('{"floatValue": -3.502823e+38}',
|
||||
'Failed to parse floatValue field: Float value too small.')
|
||||
|
||||
def testInvalidRepeated(self):
|
||||
self.CheckError('{"repeatedInt32Value": 12345}',
|
||||
@@ -863,8 +1030,6 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.ParseError,
|
||||
'Failed to parse boolMap field: Expected "true" or "false", not null.',
|
||||
json_format.Parse, text, message)
|
||||
if sys.version_info < (2, 7):
|
||||
return
|
||||
text = r'{"stringMap": {"a": 3, "\u0061": 2}}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
@@ -882,17 +1047,18 @@ class JsonFormatTest(JsonFormatBase):
|
||||
text = '{"value": "10000-01-01T00:00:00.00Z"}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
'Failed to parse value field: '
|
||||
'time data \'10000-01-01T00:00:00\' does not match'
|
||||
' format \'%Y-%m-%dT%H:%M:%S\'.',
|
||||
json_format.Parse, text, message)
|
||||
text = '{"value": "1970-01-01T00:00:00.0123456789012Z"}'
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
json_format.ParseError,
|
||||
'nanos 0123456789012 more than 9 fractional digits.',
|
||||
json_format.Parse, text, message)
|
||||
text = '{"value": "1972-01-01T01:00:00.01+08"}'
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
json_format.ParseError,
|
||||
(r'Invalid timezone offset value: \+08.'),
|
||||
json_format.Parse, text, message)
|
||||
# Time smaller than minimum time.
|
||||
@@ -901,12 +1067,21 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.ParseError,
|
||||
'Failed to parse value field: year (0 )?is out of range.',
|
||||
json_format.Parse, text, message)
|
||||
# Time bigger than maxinum time.
|
||||
# Time bigger than maximum time.
|
||||
message.value.seconds = 253402300800
|
||||
self.assertRaisesRegexp(
|
||||
OverflowError,
|
||||
'date value out of range',
|
||||
json_format.MessageToJson, message)
|
||||
# Lower case t does not accept.
|
||||
text = '{"value": "0001-01-01t00:00:00Z"}'
|
||||
with self.assertRaises(json_format.ParseError) as e:
|
||||
json_format.Parse(text, message)
|
||||
self.assertEqual(
|
||||
'Failed to parse value field: '
|
||||
'time data \'0001-01-01t00:00:00\' does not match format '
|
||||
'\'%Y-%m-%dT%H:%M:%S\', lowercase \'t\' is not accepted.',
|
||||
str(e.exception))
|
||||
|
||||
def testInvalidOneof(self):
|
||||
message = json_format_proto3_pb2.TestOneof()
|
||||
@@ -933,6 +1108,30 @@ class JsonFormatTest(JsonFormatBase):
|
||||
'Failed to parse value field: Struct must be in a dict which is 1234',
|
||||
json_format.Parse, text, message)
|
||||
|
||||
def testTimestampInvalidStringValue(self):
|
||||
message = json_format_proto3_pb2.TestTimestamp()
|
||||
text = '{"value": {"foo": 123}}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
r"Timestamp JSON value not a string: {u?'foo': 123}", json_format.Parse,
|
||||
text, message)
|
||||
|
||||
def testDurationInvalidStringValue(self):
|
||||
message = json_format_proto3_pb2.TestDuration()
|
||||
text = '{"value": {"foo": 123}}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
r"Duration JSON value not a string: {u?'foo': 123}", json_format.Parse,
|
||||
text, message)
|
||||
|
||||
def testFieldMaskInvalidStringValue(self):
|
||||
message = json_format_proto3_pb2.TestFieldMask()
|
||||
text = '{"value": {"foo": 123}}'
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
r"FieldMask JSON value not a string: {u?'foo': 123}", json_format.Parse,
|
||||
text, message)
|
||||
|
||||
def testInvalidAny(self):
|
||||
message = any_pb2.Any()
|
||||
text = '{"@type": "type.googleapis.com/google.protobuf.Int32Value"}'
|
||||
@@ -1002,6 +1201,45 @@ class JsonFormatTest(JsonFormatBase):
|
||||
json_format.ParseDict(js_dict, message)
|
||||
self.assertEqual(expected, message.int32_value)
|
||||
|
||||
def testParseDictAnyDescriptorPoolMissingType(self):
|
||||
# Confirm that ParseDict does not raise ParseError with default pool
|
||||
js_dict = {
|
||||
'any_value': {
|
||||
'@type': 'type.googleapis.com/proto3.MessageType',
|
||||
'value': 1234
|
||||
}
|
||||
}
|
||||
json_format.ParseDict(js_dict, any_test_pb2.TestAny())
|
||||
# Check ParseDict raises ParseError with empty pool
|
||||
js_dict = {
|
||||
'any_value': {
|
||||
'@type': 'type.googleapis.com/proto3.MessageType',
|
||||
'value': 1234
|
||||
}
|
||||
}
|
||||
with self.assertRaises(json_format.ParseError) as cm:
|
||||
empty_pool = descriptor_pool.DescriptorPool()
|
||||
json_format.ParseDict(js_dict,
|
||||
any_test_pb2.TestAny(),
|
||||
descriptor_pool=empty_pool)
|
||||
self.assertEqual(
|
||||
str(cm.exception),
|
||||
'Failed to parse any_value field: Can not find message descriptor by'
|
||||
' type_url: type.googleapis.com/proto3.MessageType..')
|
||||
|
||||
def testParseDictUnknownValueType(self):
|
||||
class UnknownClass(object):
|
||||
|
||||
def __repr__(self):
|
||||
return 'v'
|
||||
message = json_format_proto3_pb2.TestValue()
|
||||
self.assertRaisesRegexp(
|
||||
json_format.ParseError,
|
||||
r"Value v has unexpected type <class '.*\.UnknownClass'>.",
|
||||
json_format.ParseDict,
|
||||
{'value': UnknownClass()},
|
||||
message)
|
||||
|
||||
def testMessageToDict(self):
|
||||
message = json_format_proto3_pb2.TestMessage()
|
||||
message.int32_value = 12345
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
# 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.
|
||||
|
||||
"""Tests for google.protobuf.internal.keywords."""
|
||||
|
||||
import unittest
|
||||
|
||||
|
||||
from google.protobuf.internal import more_messages_pb2
|
||||
from google.protobuf import descriptor_pool
|
||||
|
||||
|
||||
class KeywordsConflictTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(KeywordsConflictTest, self).setUp()
|
||||
self.pool = descriptor_pool.Default()
|
||||
|
||||
def testMessage(self):
|
||||
message = getattr(more_messages_pb2, 'class')()
|
||||
message.int_field = 123
|
||||
self.assertEqual(message.int_field, 123)
|
||||
des = self.pool.FindMessageTypeByName('google.protobuf.internal.class')
|
||||
self.assertEqual(des.name, 'class')
|
||||
|
||||
def testNestedMessage(self):
|
||||
message = getattr(more_messages_pb2, 'class')()
|
||||
message.nested_message.field = 234
|
||||
self.assertEqual(message.nested_message.field, 234)
|
||||
des = self.pool.FindMessageTypeByName('google.protobuf.internal.class.try')
|
||||
self.assertEqual(des.name, 'try')
|
||||
|
||||
def testField(self):
|
||||
message = getattr(more_messages_pb2, 'class')()
|
||||
setattr(message, 'if', 123)
|
||||
setattr(message, 'as', 1)
|
||||
self.assertEqual(getattr(message, 'if'), 123)
|
||||
self.assertEqual(getattr(message, 'as'), 1)
|
||||
|
||||
def testEnum(self):
|
||||
class_ = getattr(more_messages_pb2, 'class')
|
||||
message = class_()
|
||||
# Normal enum value.
|
||||
message.enum_field = more_messages_pb2.default
|
||||
self.assertEqual(message.enum_field, more_messages_pb2.default)
|
||||
# Top level enum value.
|
||||
message.enum_field = getattr(more_messages_pb2, 'else')
|
||||
self.assertEqual(message.enum_field, 1)
|
||||
# Nested enum value
|
||||
message.nested_enum_field = getattr(class_, 'True')
|
||||
self.assertEqual(message.nested_enum_field, 1)
|
||||
|
||||
def testExtension(self):
|
||||
message = getattr(more_messages_pb2, 'class')()
|
||||
# Top level extension
|
||||
extension1 = getattr(more_messages_pb2, 'continue')
|
||||
message.Extensions[extension1] = 456
|
||||
self.assertEqual(message.Extensions[extension1], 456)
|
||||
# None top level extension
|
||||
extension2 = getattr(more_messages_pb2.ExtendClass, 'return')
|
||||
message.Extensions[extension2] = 789
|
||||
self.assertEqual(message.Extensions[extension2], 789)
|
||||
|
||||
def testExtensionForNestedMessage(self):
|
||||
message = getattr(more_messages_pb2, 'class')()
|
||||
extension = getattr(more_messages_pb2, 'with')
|
||||
message.nested_message.Extensions[extension] = 999
|
||||
self.assertEqual(message.nested_message.Extensions[extension], 999)
|
||||
|
||||
def TestFullKeywordUsed(self):
|
||||
message = more_messages_pb2.TestFullKeyword()
|
||||
message.field2.int_field = 123
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -34,20 +32,19 @@
|
||||
|
||||
__author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
from google.protobuf import descriptor_pb2
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import factory_test1_pb2
|
||||
from google.protobuf.internal import factory_test2_pb2
|
||||
from google.protobuf.internal import testing_refleaks
|
||||
from google.protobuf import descriptor_database
|
||||
from google.protobuf import descriptor_pool
|
||||
from google.protobuf import message_factory
|
||||
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class MessageFactoryTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
@@ -104,6 +101,23 @@ class MessageFactoryTest(unittest.TestCase):
|
||||
'google.protobuf.python.internal.Factory2Message'))
|
||||
self.assertTrue(cls is cls2)
|
||||
|
||||
def testCreatePrototypeOverride(self):
|
||||
class MyMessageFactory(message_factory.MessageFactory):
|
||||
|
||||
def CreatePrototype(self, descriptor):
|
||||
cls = super(MyMessageFactory, self).CreatePrototype(descriptor)
|
||||
cls.additional_field = 'Some value'
|
||||
return cls
|
||||
|
||||
db = descriptor_database.DescriptorDatabase()
|
||||
pool = descriptor_pool.DescriptorPool(db)
|
||||
db.Add(self.factory_test1_fd)
|
||||
db.Add(self.factory_test2_fd)
|
||||
factory = MyMessageFactory()
|
||||
cls = factory.GetPrototype(pool.FindMessageTypeByName(
|
||||
'google.protobuf.python.internal.Factory2Message'))
|
||||
self.assertTrue(hasattr(cls, 'additional_field'))
|
||||
|
||||
def testGetMessages(self):
|
||||
# performed twice because multiple calls with the same input must be allowed
|
||||
for _ in range(2):
|
||||
@@ -136,16 +150,15 @@ class MessageFactoryTest(unittest.TestCase):
|
||||
'google.protobuf.python.internal.Factory2Message.one_more_field')
|
||||
ext2 = msg1.Extensions._FindExtensionByName(
|
||||
'google.protobuf.python.internal.another_field')
|
||||
self.assertEqual(0, len(msg1.Extensions))
|
||||
msg1.Extensions[ext1] = 'test1'
|
||||
msg1.Extensions[ext2] = 'test2'
|
||||
self.assertEqual('test1', msg1.Extensions[ext1])
|
||||
self.assertEqual('test2', msg1.Extensions[ext2])
|
||||
self.assertEqual(None,
|
||||
msg1.Extensions._FindExtensionByNumber(12321))
|
||||
self.assertEqual(2, len(msg1.Extensions))
|
||||
if api_implementation.Type() == 'cpp':
|
||||
# TODO(jieluo): Fix len to return the correct value.
|
||||
# self.assertEqual(2, len(msg1.Extensions))
|
||||
self.assertEqual(len(msg1.Extensions), len(msg1.Extensions))
|
||||
self.assertRaises(TypeError,
|
||||
msg1.Extensions._FindExtensionByName, 0)
|
||||
self.assertRaises(TypeError,
|
||||
|
||||
Executable → Regular
File mode changed.
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/message_set_extensions.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,196 +14,58 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
MESSAGE_SET_EXTENSION3_FIELD_NUMBER = 98418655
|
||||
message_set_extension3 = _descriptor.FieldDescriptor(
|
||||
name='message_set_extension3', full_name='google.protobuf.internal.message_set_extension3', index=0,
|
||||
number=98418655, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
message_set_extension3 = DESCRIPTOR.extensions_by_name['message_set_extension3']
|
||||
|
||||
|
||||
_TESTMESSAGESET = _descriptor.Descriptor(
|
||||
name='TestMessageSet',
|
||||
full_name='google.protobuf.internal.TestMessageSet',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=_b('\010\001'),
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(4, 2147483647), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=83,
|
||||
serialized_end=113,
|
||||
)
|
||||
|
||||
|
||||
_TESTMESSAGESETEXTENSION1 = _descriptor.Descriptor(
|
||||
name='TestMessageSetExtension1',
|
||||
full_name='google.protobuf.internal.TestMessageSetExtension1',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='i', full_name='google.protobuf.internal.TestMessageSetExtension1.i', index=0,
|
||||
number=15, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='message_set_extension', full_name='google.protobuf.internal.TestMessageSetExtension1.message_set_extension', index=0,
|
||||
number=98418603, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=116,
|
||||
serialized_end=281,
|
||||
)
|
||||
|
||||
|
||||
_TESTMESSAGESETEXTENSION2 = _descriptor.Descriptor(
|
||||
name='TestMessageSetExtension2',
|
||||
full_name='google.protobuf.internal.TestMessageSetExtension2',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='str', full_name='google.protobuf.internal.TestMessageSetExtension2.str', index=0,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='message_set_extension', full_name='google.protobuf.internal.TestMessageSetExtension2.message_set_extension', index=0,
|
||||
number=98418634, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=284,
|
||||
serialized_end=451,
|
||||
)
|
||||
|
||||
|
||||
_TESTMESSAGESETEXTENSION3 = _descriptor.Descriptor(
|
||||
name='TestMessageSetExtension3',
|
||||
full_name='google.protobuf.internal.TestMessageSetExtension3',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='text', full_name='google.protobuf.internal.TestMessageSetExtension3.text', index=0,
|
||||
number=35, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=453,
|
||||
serialized_end=493,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['TestMessageSet'] = _TESTMESSAGESET
|
||||
DESCRIPTOR.message_types_by_name['TestMessageSetExtension1'] = _TESTMESSAGESETEXTENSION1
|
||||
DESCRIPTOR.message_types_by_name['TestMessageSetExtension2'] = _TESTMESSAGESETEXTENSION2
|
||||
DESCRIPTOR.message_types_by_name['TestMessageSetExtension3'] = _TESTMESSAGESETEXTENSION3
|
||||
DESCRIPTOR.extensions_by_name['message_set_extension3'] = message_set_extension3
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestMessageSet = _reflection.GeneratedProtocolMessageType('TestMessageSet', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTMESSAGESET,
|
||||
__module__ = 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
_TESTMESSAGESET = DESCRIPTOR.message_types_by_name['TestMessageSet']
|
||||
_TESTMESSAGESETEXTENSION1 = DESCRIPTOR.message_types_by_name['TestMessageSetExtension1']
|
||||
_TESTMESSAGESETEXTENSION2 = DESCRIPTOR.message_types_by_name['TestMessageSetExtension2']
|
||||
_TESTMESSAGESETEXTENSION3 = DESCRIPTOR.message_types_by_name['TestMessageSetExtension3']
|
||||
TestMessageSet = _reflection.GeneratedProtocolMessageType('TestMessageSet', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTMESSAGESET,
|
||||
'__module__' : 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestMessageSet)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestMessageSet)
|
||||
|
||||
TestMessageSetExtension1 = _reflection.GeneratedProtocolMessageType('TestMessageSetExtension1', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTMESSAGESETEXTENSION1,
|
||||
__module__ = 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
TestMessageSetExtension1 = _reflection.GeneratedProtocolMessageType('TestMessageSetExtension1', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTMESSAGESETEXTENSION1,
|
||||
'__module__' : 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestMessageSetExtension1)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestMessageSetExtension1)
|
||||
|
||||
TestMessageSetExtension2 = _reflection.GeneratedProtocolMessageType('TestMessageSetExtension2', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTMESSAGESETEXTENSION2,
|
||||
__module__ = 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
TestMessageSetExtension2 = _reflection.GeneratedProtocolMessageType('TestMessageSetExtension2', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTMESSAGESETEXTENSION2,
|
||||
'__module__' : 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestMessageSetExtension2)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestMessageSetExtension2)
|
||||
|
||||
TestMessageSetExtension3 = _reflection.GeneratedProtocolMessageType('TestMessageSetExtension3', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTMESSAGESETEXTENSION3,
|
||||
__module__ = 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
TestMessageSetExtension3 = _reflection.GeneratedProtocolMessageType('TestMessageSetExtension3', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTMESSAGESETEXTENSION3,
|
||||
'__module__' : 'google.protobuf.internal.message_set_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TestMessageSetExtension3)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestMessageSetExtension3)
|
||||
|
||||
message_set_extension3.message_type = _TESTMESSAGESETEXTENSION3
|
||||
TestMessageSet.RegisterExtension(message_set_extension3)
|
||||
_TESTMESSAGESETEXTENSION1.extensions_by_name['message_set_extension'].message_type = _TESTMESSAGESETEXTENSION1
|
||||
TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION1.extensions_by_name['message_set_extension'])
|
||||
_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'].message_type = _TESTMESSAGESETEXTENSION2
|
||||
TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'])
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
TestMessageSet.RegisterExtension(message_set_extension3)
|
||||
TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION1.extensions_by_name['message_set_extension'])
|
||||
TestMessageSet.RegisterExtension(_TESTMESSAGESETEXTENSION2.extensions_by_name['message_set_extension'])
|
||||
|
||||
_TESTMESSAGESET._options = None
|
||||
DESCRIPTOR._options = None
|
||||
_TESTMESSAGESET._options = None
|
||||
_TESTMESSAGESET._serialized_options = b'\010\001'
|
||||
_TESTMESSAGESET._serialized_start=83
|
||||
_TESTMESSAGESET._serialized_end=113
|
||||
_TESTMESSAGESETEXTENSION1._serialized_start=116
|
||||
_TESTMESSAGESETEXTENSION1._serialized_end=281
|
||||
_TESTMESSAGESETEXTENSION2._serialized_start=284
|
||||
_TESTMESSAGESETEXTENSION2._serialized_end=451
|
||||
_TESTMESSAGESETEXTENSION3._serialized_start=453
|
||||
_TESTMESSAGESETEXTENSION3._serialized_end=493
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Executable → Regular
+545
-207
File diff suppressed because it is too large.
Load diff
@@ -30,6 +30,7 @@
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
|
||||
package google.protobuf.python.internal;
|
||||
|
||||
message TestEnumValues {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/missing_enum_values.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,214 +14,51 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
_TESTENUMVALUES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.TestEnumValues.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ZERO', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='ONE', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=378,
|
||||
serialized_end=409,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_TESTENUMVALUES_NESTEDENUM)
|
||||
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.TestMissingEnumValues.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='TWO', index=0, number=2,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=730,
|
||||
serialized_end=751,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_TESTMISSINGENUMVALUES_NESTEDENUM)
|
||||
|
||||
|
||||
_TESTENUMVALUES = _descriptor.Descriptor(
|
||||
name='TestEnumValues',
|
||||
full_name='google.protobuf.python.internal.TestEnumValues',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_enum', full_name='google.protobuf.python.internal.TestEnumValues.optional_nested_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),
|
||||
_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,
|
||||
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,
|
||||
serialized_options=_b('\020\001'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_TESTENUMVALUES_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=88,
|
||||
serialized_end=409,
|
||||
)
|
||||
|
||||
|
||||
_TESTMISSINGENUMVALUES = _descriptor.Descriptor(
|
||||
name='TestMissingEnumValues',
|
||||
full_name='google.protobuf.python.internal.TestMissingEnumValues',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='optional_nested_enum', full_name='google.protobuf.python.internal.TestMissingEnumValues.optional_nested_enum', index=0,
|
||||
number=1, type=14, cpp_type=8, label=1,
|
||||
has_default_value=False, default_value=2,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
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,
|
||||
serialized_options=_b('\020\001'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=412,
|
||||
serialized_end=751,
|
||||
)
|
||||
|
||||
|
||||
_JUSTSTRING = _descriptor.Descriptor(
|
||||
name='JustString',
|
||||
full_name='google.protobuf.python.internal.JustString',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='dummy', full_name='google.protobuf.python.internal.JustString.dummy', index=0,
|
||||
number=1, type=9, cpp_type=9, label=2,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=753,
|
||||
serialized_end=780,
|
||||
)
|
||||
|
||||
_TESTENUMVALUES.fields_by_name['optional_nested_enum'].enum_type = _TESTENUMVALUES_NESTEDENUM
|
||||
_TESTENUMVALUES.fields_by_name['repeated_nested_enum'].enum_type = _TESTENUMVALUES_NESTEDENUM
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum'].enum_type = _TESTENUMVALUES_NESTEDENUM
|
||||
_TESTENUMVALUES_NESTEDENUM.containing_type = _TESTENUMVALUES
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['optional_nested_enum'].enum_type = _TESTMISSINGENUMVALUES_NESTEDENUM
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['repeated_nested_enum'].enum_type = _TESTMISSINGENUMVALUES_NESTEDENUM
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum'].enum_type = _TESTMISSINGENUMVALUES_NESTEDENUM
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM.containing_type = _TESTMISSINGENUMVALUES
|
||||
DESCRIPTOR.message_types_by_name['TestEnumValues'] = _TESTENUMVALUES
|
||||
DESCRIPTOR.message_types_by_name['TestMissingEnumValues'] = _TESTMISSINGENUMVALUES
|
||||
DESCRIPTOR.message_types_by_name['JustString'] = _JUSTSTRING
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestEnumValues = _reflection.GeneratedProtocolMessageType('TestEnumValues', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTENUMVALUES,
|
||||
__module__ = 'google.protobuf.internal.missing_enum_values_pb2'
|
||||
_TESTENUMVALUES = DESCRIPTOR.message_types_by_name['TestEnumValues']
|
||||
_TESTMISSINGENUMVALUES = DESCRIPTOR.message_types_by_name['TestMissingEnumValues']
|
||||
_JUSTSTRING = DESCRIPTOR.message_types_by_name['JustString']
|
||||
_TESTENUMVALUES_NESTEDENUM = _TESTENUMVALUES.enum_types_by_name['NestedEnum']
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM = _TESTMISSINGENUMVALUES.enum_types_by_name['NestedEnum']
|
||||
TestEnumValues = _reflection.GeneratedProtocolMessageType('TestEnumValues', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTENUMVALUES,
|
||||
'__module__' : 'google.protobuf.internal.missing_enum_values_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestEnumValues)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestEnumValues)
|
||||
|
||||
TestMissingEnumValues = _reflection.GeneratedProtocolMessageType('TestMissingEnumValues', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTMISSINGENUMVALUES,
|
||||
__module__ = 'google.protobuf.internal.missing_enum_values_pb2'
|
||||
TestMissingEnumValues = _reflection.GeneratedProtocolMessageType('TestMissingEnumValues', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTMISSINGENUMVALUES,
|
||||
'__module__' : 'google.protobuf.internal.missing_enum_values_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestMissingEnumValues)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestMissingEnumValues)
|
||||
|
||||
JustString = _reflection.GeneratedProtocolMessageType('JustString', (_message.Message,), dict(
|
||||
DESCRIPTOR = _JUSTSTRING,
|
||||
__module__ = 'google.protobuf.internal.missing_enum_values_pb2'
|
||||
JustString = _reflection.GeneratedProtocolMessageType('JustString', (_message.Message,), {
|
||||
'DESCRIPTOR' : _JUSTSTRING,
|
||||
'__module__' : 'google.protobuf.internal.missing_enum_values_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.JustString)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(JustString)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum']._options = None
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum']._options = None
|
||||
DESCRIPTOR._options = None
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum']._options = None
|
||||
_TESTENUMVALUES.fields_by_name['packed_nested_enum']._serialized_options = b'\020\001'
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum']._options = None
|
||||
_TESTMISSINGENUMVALUES.fields_by_name['packed_nested_enum']._serialized_options = b'\020\001'
|
||||
_TESTENUMVALUES._serialized_start=88
|
||||
_TESTENUMVALUES._serialized_end=409
|
||||
_TESTENUMVALUES_NESTEDENUM._serialized_start=378
|
||||
_TESTENUMVALUES_NESTEDENUM._serialized_end=409
|
||||
_TESTMISSINGENUMVALUES._serialized_start=412
|
||||
_TESTMISSINGENUMVALUES._serialized_end=751
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM._serialized_start=730
|
||||
_TESTMISSINGENUMVALUES_NESTEDENUM._serialized_end=751
|
||||
_JUSTSTRING._serialized_start=753
|
||||
_JUSTSTRING._serialized_end=780
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -34,22 +34,25 @@ syntax = "proto2";
|
||||
|
||||
package google.protobuf.internal;
|
||||
|
||||
|
||||
message TopLevelMessage {
|
||||
optional ExtendedMessage submessage = 1;
|
||||
optional ExtendedMessage submessage = 1 [lazy = true];
|
||||
optional NestedMessage nested_message = 2 [lazy = true];
|
||||
}
|
||||
|
||||
message NestedMessage {
|
||||
optional ExtendedMessage submessage = 1 [lazy = true];
|
||||
}
|
||||
|
||||
message ExtendedMessage {
|
||||
extensions 1 to max;
|
||||
optional int32 optional_int32 = 1001;
|
||||
repeated string repeated_string = 1002;
|
||||
extensions 1 to 999;
|
||||
}
|
||||
|
||||
|
||||
message ForeignMessage {
|
||||
optional int32 foreign_message_int = 1;
|
||||
}
|
||||
|
||||
|
||||
extend ExtendedMessage {
|
||||
optional int32 optional_int_extension = 1;
|
||||
optional ForeignMessage optional_message_extension = 2;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/more_extensions_dynamic.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,89 +15,30 @@ _sym_db = _symbol_database.Default()
|
||||
from google.protobuf.internal import more_extensions_pb2 as google_dot_protobuf_dot_internal_dot_more__extensions__pb2
|
||||
|
||||
|
||||
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,])
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
DYNAMIC_INT32_EXTENSION_FIELD_NUMBER = 100
|
||||
dynamic_int32_extension = _descriptor.FieldDescriptor(
|
||||
name='dynamic_int32_extension', full_name='google.protobuf.internal.dynamic_int32_extension', index=0,
|
||||
number=100, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
dynamic_int32_extension = DESCRIPTOR.extensions_by_name['dynamic_int32_extension']
|
||||
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,
|
||||
number=101, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
dynamic_message_extension = DESCRIPTOR.extensions_by_name['dynamic_message_extension']
|
||||
REPEATED_DYNAMIC_MESSAGE_EXTENSION_FIELD_NUMBER = 102
|
||||
repeated_dynamic_message_extension = _descriptor.FieldDescriptor(
|
||||
name='repeated_dynamic_message_extension', full_name='google.protobuf.internal.repeated_dynamic_message_extension', index=2,
|
||||
number=102, type=11, cpp_type=10, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
repeated_dynamic_message_extension = DESCRIPTOR.extensions_by_name['repeated_dynamic_message_extension']
|
||||
|
||||
|
||||
_DYNAMICMESSAGETYPE = _descriptor.Descriptor(
|
||||
name='DynamicMessageType',
|
||||
full_name='google.protobuf.internal.DynamicMessageType',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='a', full_name='google.protobuf.internal.DynamicMessageType.a', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=132,
|
||||
serialized_end=163,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['DynamicMessageType'] = _DYNAMICMESSAGETYPE
|
||||
DESCRIPTOR.extensions_by_name['dynamic_int32_extension'] = dynamic_int32_extension
|
||||
DESCRIPTOR.extensions_by_name['dynamic_message_extension'] = dynamic_message_extension
|
||||
DESCRIPTOR.extensions_by_name['repeated_dynamic_message_extension'] = repeated_dynamic_message_extension
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
DynamicMessageType = _reflection.GeneratedProtocolMessageType('DynamicMessageType', (_message.Message,), dict(
|
||||
DESCRIPTOR = _DYNAMICMESSAGETYPE,
|
||||
__module__ = 'google.protobuf.internal.more_extensions_dynamic_pb2'
|
||||
_DYNAMICMESSAGETYPE = DESCRIPTOR.message_types_by_name['DynamicMessageType']
|
||||
DynamicMessageType = _reflection.GeneratedProtocolMessageType('DynamicMessageType', (_message.Message,), {
|
||||
'DESCRIPTOR' : _DYNAMICMESSAGETYPE,
|
||||
'__module__' : 'google.protobuf.internal.more_extensions_dynamic_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.DynamicMessageType)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(DynamicMessageType)
|
||||
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(dynamic_int32_extension)
|
||||
dynamic_message_extension.message_type = _DYNAMICMESSAGETYPE
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(dynamic_message_extension)
|
||||
repeated_dynamic_message_extension.message_type = _DYNAMICMESSAGETYPE
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(repeated_dynamic_message_extension)
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(dynamic_int32_extension)
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(dynamic_message_extension)
|
||||
google_dot_protobuf_dot_internal_dot_more__extensions__pb2.ExtendedMessage.RegisterExtension(repeated_dynamic_message_extension)
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_DYNAMICMESSAGETYPE._serialized_start=132
|
||||
_DYNAMICMESSAGETYPE._serialized_end=163
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/more_extensions.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,170 +14,69 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n.google/protobuf/internal/more_extensions.proto\x12\x18google.protobuf.internal\"\x99\x01\n\x0fTopLevelMessage\x12\x41\n\nsubmessage\x18\x01 \x01(\x0b\x32).google.protobuf.internal.ExtendedMessageB\x02(\x01\x12\x43\n\x0enested_message\x18\x02 \x01(\x0b\x32\'.google.protobuf.internal.NestedMessageB\x02(\x01\"R\n\rNestedMessage\x12\x41\n\nsubmessage\x18\x01 \x01(\x0b\x32).google.protobuf.internal.ExtendedMessageB\x02(\x01\"K\n\x0f\x45xtendedMessage\x12\x17\n\x0eoptional_int32\x18\xe9\x07 \x01(\x05\x12\x18\n\x0frepeated_string\x18\xea\x07 \x03(\t*\x05\x08\x01\x10\xe8\x07\"-\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')
|
||||
|
||||
|
||||
OPTIONAL_INT_EXTENSION_FIELD_NUMBER = 1
|
||||
optional_int_extension = _descriptor.FieldDescriptor(
|
||||
name='optional_int_extension', full_name='google.protobuf.internal.optional_int_extension', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
optional_int_extension = DESCRIPTOR.extensions_by_name['optional_int_extension']
|
||||
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,
|
||||
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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
optional_message_extension = DESCRIPTOR.extensions_by_name['optional_message_extension']
|
||||
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,
|
||||
number=3, type=5, cpp_type=1, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
repeated_int_extension = DESCRIPTOR.extensions_by_name['repeated_int_extension']
|
||||
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,
|
||||
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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
repeated_message_extension = DESCRIPTOR.extensions_by_name['repeated_message_extension']
|
||||
|
||||
|
||||
_TOPLEVELMESSAGE = _descriptor.Descriptor(
|
||||
name='TopLevelMessage',
|
||||
full_name='google.protobuf.internal.TopLevelMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='submessage', full_name='google.protobuf.internal.TopLevelMessage.submessage', index=0,
|
||||
number=1, 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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=76,
|
||||
serialized_end=156,
|
||||
)
|
||||
|
||||
|
||||
_EXTENDEDMESSAGE = _descriptor.Descriptor(
|
||||
name='ExtendedMessage',
|
||||
full_name='google.protobuf.internal.ExtendedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=158,
|
||||
serialized_end=185,
|
||||
)
|
||||
|
||||
|
||||
_FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
name='ForeignMessage',
|
||||
full_name='google.protobuf.internal.ForeignMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='foreign_message_int', full_name='google.protobuf.internal.ForeignMessage.foreign_message_int', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=187,
|
||||
serialized_end=232,
|
||||
)
|
||||
|
||||
_TOPLEVELMESSAGE.fields_by_name['submessage'].message_type = _EXTENDEDMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['TopLevelMessage'] = _TOPLEVELMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['ExtendedMessage'] = _EXTENDEDMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['ForeignMessage'] = _FOREIGNMESSAGE
|
||||
DESCRIPTOR.extensions_by_name['optional_int_extension'] = optional_int_extension
|
||||
DESCRIPTOR.extensions_by_name['optional_message_extension'] = optional_message_extension
|
||||
DESCRIPTOR.extensions_by_name['repeated_int_extension'] = repeated_int_extension
|
||||
DESCRIPTOR.extensions_by_name['repeated_message_extension'] = repeated_message_extension
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TopLevelMessage = _reflection.GeneratedProtocolMessageType('TopLevelMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TOPLEVELMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.more_extensions_pb2'
|
||||
_TOPLEVELMESSAGE = DESCRIPTOR.message_types_by_name['TopLevelMessage']
|
||||
_NESTEDMESSAGE = DESCRIPTOR.message_types_by_name['NestedMessage']
|
||||
_EXTENDEDMESSAGE = DESCRIPTOR.message_types_by_name['ExtendedMessage']
|
||||
_FOREIGNMESSAGE = DESCRIPTOR.message_types_by_name['ForeignMessage']
|
||||
TopLevelMessage = _reflection.GeneratedProtocolMessageType('TopLevelMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TOPLEVELMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.more_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.TopLevelMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TopLevelMessage)
|
||||
|
||||
ExtendedMessage = _reflection.GeneratedProtocolMessageType('ExtendedMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _EXTENDEDMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.more_extensions_pb2'
|
||||
NestedMessage = _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _NESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.more_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.NestedMessage)
|
||||
})
|
||||
_sym_db.RegisterMessage(NestedMessage)
|
||||
|
||||
ExtendedMessage = _reflection.GeneratedProtocolMessageType('ExtendedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _EXTENDEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.more_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.ExtendedMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(ExtendedMessage)
|
||||
|
||||
ForeignMessage = _reflection.GeneratedProtocolMessageType('ForeignMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FOREIGNMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.more_extensions_pb2'
|
||||
ForeignMessage = _reflection.GeneratedProtocolMessageType('ForeignMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FOREIGNMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.more_extensions_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.internal.ForeignMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(ForeignMessage)
|
||||
|
||||
ExtendedMessage.RegisterExtension(optional_int_extension)
|
||||
optional_message_extension.message_type = _FOREIGNMESSAGE
|
||||
ExtendedMessage.RegisterExtension(optional_message_extension)
|
||||
ExtendedMessage.RegisterExtension(repeated_int_extension)
|
||||
repeated_message_extension.message_type = _FOREIGNMESSAGE
|
||||
ExtendedMessage.RegisterExtension(repeated_message_extension)
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
ExtendedMessage.RegisterExtension(optional_int_extension)
|
||||
ExtendedMessage.RegisterExtension(optional_message_extension)
|
||||
ExtendedMessage.RegisterExtension(repeated_int_extension)
|
||||
ExtendedMessage.RegisterExtension(repeated_message_extension)
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_TOPLEVELMESSAGE.fields_by_name['submessage']._options = None
|
||||
_TOPLEVELMESSAGE.fields_by_name['submessage']._serialized_options = b'(\001'
|
||||
_TOPLEVELMESSAGE.fields_by_name['nested_message']._options = None
|
||||
_TOPLEVELMESSAGE.fields_by_name['nested_message']._serialized_options = b'(\001'
|
||||
_NESTEDMESSAGE.fields_by_name['submessage']._options = None
|
||||
_NESTEDMESSAGE.fields_by_name['submessage']._serialized_options = b'(\001'
|
||||
_TOPLEVELMESSAGE._serialized_start=77
|
||||
_TOPLEVELMESSAGE._serialized_end=230
|
||||
_NESTEDMESSAGE._serialized_start=232
|
||||
_NESTEDMESSAGE._serialized_end=314
|
||||
_EXTENDEDMESSAGE._serialized_start=316
|
||||
_EXTENDEDMESSAGE._serialized_end=391
|
||||
_FOREIGNMESSAGE._serialized_start=393
|
||||
_FOREIGNMESSAGE._serialized_end=438
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -30,6 +30,8 @@
|
||||
|
||||
// Author: robinson@google.com (Will Robinson)
|
||||
|
||||
// LINT: LEGACY_NAMES
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
package google.protobuf.internal;
|
||||
@@ -38,15 +40,321 @@ package google.protobuf.internal;
|
||||
// canonicalization of serialized output, which should always be in tag order.
|
||||
// We also mix in some extensions for extra fun.
|
||||
message OutOfOrderFields {
|
||||
optional sint32 optional_sint32 = 5;
|
||||
optional sint32 optional_sint32 = 5;
|
||||
extensions 4 to 4;
|
||||
optional uint32 optional_uint32 = 3;
|
||||
optional uint32 optional_uint32 = 3;
|
||||
extensions 2 to 2;
|
||||
optional int32 optional_int32 = 1;
|
||||
};
|
||||
|
||||
optional int32 optional_int32 = 1;
|
||||
}
|
||||
|
||||
extend OutOfOrderFields {
|
||||
optional uint64 optional_uint64 = 4;
|
||||
optional int64 optional_int64 = 2;
|
||||
optional uint64 optional_uint64 = 4;
|
||||
optional int64 optional_int64 = 2;
|
||||
}
|
||||
|
||||
enum is { // top level enum keyword
|
||||
default = 0;
|
||||
else = 1; // top level enum value keyword
|
||||
}
|
||||
|
||||
message class { // message keyword
|
||||
optional int32 int_field = 1 [json_name = "json_int"];
|
||||
optional int32 if = 2; // field keyword
|
||||
optional is as = 3; // enum field keyword
|
||||
optional is enum_field = 4;
|
||||
enum for { // nested enum keyword
|
||||
default = 0;
|
||||
True = 1; // nested enum value keyword
|
||||
}
|
||||
optional for nested_enum_field = 5;
|
||||
message try {
|
||||
optional int32 field = 1;
|
||||
extensions 999 to 9999;
|
||||
}
|
||||
optional try
|
||||
nested_message = 6;
|
||||
extensions 999 to 9999;
|
||||
}
|
||||
|
||||
extend class {
|
||||
optional int32 continue = 1001; // top level extension keyword
|
||||
}
|
||||
|
||||
extend class.try {
|
||||
optional int32 with = 1001;
|
||||
}
|
||||
|
||||
message ExtendClass {
|
||||
extend class {
|
||||
optional int32 return = 1002; // nested extension keyword
|
||||
}
|
||||
}
|
||||
|
||||
message TestFullKeyword {
|
||||
optional google.protobuf.internal.OutOfOrderFields field1 = 1;
|
||||
optional google.protobuf.internal.class field2 = 2;
|
||||
}
|
||||
|
||||
// TODO(jieluo): Add keyword support for service.
|
||||
// service False {
|
||||
// rpc Bar(class) returns (class);
|
||||
// }
|
||||
|
||||
message LotsNestedMessage {
|
||||
message B0 {}
|
||||
message B1 {}
|
||||
message B2 {}
|
||||
message B3 {}
|
||||
message B4 {}
|
||||
message B5 {}
|
||||
message B6 {}
|
||||
message B7 {}
|
||||
message B8 {}
|
||||
message B9 {}
|
||||
message B10 {}
|
||||
message B11 {}
|
||||
message B12 {}
|
||||
message B13 {}
|
||||
message B14 {}
|
||||
message B15 {}
|
||||
message B16 {}
|
||||
message B17 {}
|
||||
message B18 {}
|
||||
message B19 {}
|
||||
message B20 {}
|
||||
message B21 {}
|
||||
message B22 {}
|
||||
message B23 {}
|
||||
message B24 {}
|
||||
message B25 {}
|
||||
message B26 {}
|
||||
message B27 {}
|
||||
message B28 {}
|
||||
message B29 {}
|
||||
message B30 {}
|
||||
message B31 {}
|
||||
message B32 {}
|
||||
message B33 {}
|
||||
message B34 {}
|
||||
message B35 {}
|
||||
message B36 {}
|
||||
message B37 {}
|
||||
message B38 {}
|
||||
message B39 {}
|
||||
message B40 {}
|
||||
message B41 {}
|
||||
message B42 {}
|
||||
message B43 {}
|
||||
message B44 {}
|
||||
message B45 {}
|
||||
message B46 {}
|
||||
message B47 {}
|
||||
message B48 {}
|
||||
message B49 {}
|
||||
message B50 {}
|
||||
message B51 {}
|
||||
message B52 {}
|
||||
message B53 {}
|
||||
message B54 {}
|
||||
message B55 {}
|
||||
message B56 {}
|
||||
message B57 {}
|
||||
message B58 {}
|
||||
message B59 {}
|
||||
message B60 {}
|
||||
message B61 {}
|
||||
message B62 {}
|
||||
message B63 {}
|
||||
message B64 {}
|
||||
message B65 {}
|
||||
message B66 {}
|
||||
message B67 {}
|
||||
message B68 {}
|
||||
message B69 {}
|
||||
message B70 {}
|
||||
message B71 {}
|
||||
message B72 {}
|
||||
message B73 {}
|
||||
message B74 {}
|
||||
message B75 {}
|
||||
message B76 {}
|
||||
message B77 {}
|
||||
message B78 {}
|
||||
message B79 {}
|
||||
message B80 {}
|
||||
message B81 {}
|
||||
message B82 {}
|
||||
message B83 {}
|
||||
message B84 {}
|
||||
message B85 {}
|
||||
message B86 {}
|
||||
message B87 {}
|
||||
message B88 {}
|
||||
message B89 {}
|
||||
message B90 {}
|
||||
message B91 {}
|
||||
message B92 {}
|
||||
message B93 {}
|
||||
message B94 {}
|
||||
message B95 {}
|
||||
message B96 {}
|
||||
message B97 {}
|
||||
message B98 {}
|
||||
message B99 {}
|
||||
message B100 {}
|
||||
message B101 {}
|
||||
message B102 {}
|
||||
message B103 {}
|
||||
message B104 {}
|
||||
message B105 {}
|
||||
message B106 {}
|
||||
message B107 {}
|
||||
message B108 {}
|
||||
message B109 {}
|
||||
message B110 {}
|
||||
message B111 {}
|
||||
message B112 {}
|
||||
message B113 {}
|
||||
message B114 {}
|
||||
message B115 {}
|
||||
message B116 {}
|
||||
message B117 {}
|
||||
message B118 {}
|
||||
message B119 {}
|
||||
message B120 {}
|
||||
message B121 {}
|
||||
message B122 {}
|
||||
message B123 {}
|
||||
message B124 {}
|
||||
message B125 {}
|
||||
message B126 {}
|
||||
message B127 {}
|
||||
message B128 {}
|
||||
message B129 {}
|
||||
message B130 {}
|
||||
message B131 {}
|
||||
message B132 {}
|
||||
message B133 {}
|
||||
message B134 {}
|
||||
message B135 {}
|
||||
message B136 {}
|
||||
message B137 {}
|
||||
message B138 {}
|
||||
message B139 {}
|
||||
message B140 {}
|
||||
message B141 {}
|
||||
message B142 {}
|
||||
message B143 {}
|
||||
message B144 {}
|
||||
message B145 {}
|
||||
message B146 {}
|
||||
message B147 {}
|
||||
message B148 {}
|
||||
message B149 {}
|
||||
message B150 {}
|
||||
message B151 {}
|
||||
message B152 {}
|
||||
message B153 {}
|
||||
message B154 {}
|
||||
message B155 {}
|
||||
message B156 {}
|
||||
message B157 {}
|
||||
message B158 {}
|
||||
message B159 {}
|
||||
message B160 {}
|
||||
message B161 {}
|
||||
message B162 {}
|
||||
message B163 {}
|
||||
message B164 {}
|
||||
message B165 {}
|
||||
message B166 {}
|
||||
message B167 {}
|
||||
message B168 {}
|
||||
message B169 {}
|
||||
message B170 {}
|
||||
message B171 {}
|
||||
message B172 {}
|
||||
message B173 {}
|
||||
message B174 {}
|
||||
message B175 {}
|
||||
message B176 {}
|
||||
message B177 {}
|
||||
message B178 {}
|
||||
message B179 {}
|
||||
message B180 {}
|
||||
message B181 {}
|
||||
message B182 {}
|
||||
message B183 {}
|
||||
message B184 {}
|
||||
message B185 {}
|
||||
message B186 {}
|
||||
message B187 {}
|
||||
message B188 {}
|
||||
message B189 {}
|
||||
message B190 {}
|
||||
message B191 {}
|
||||
message B192 {}
|
||||
message B193 {}
|
||||
message B194 {}
|
||||
message B195 {}
|
||||
message B196 {}
|
||||
message B197 {}
|
||||
message B198 {}
|
||||
message B199 {}
|
||||
message B200 {}
|
||||
message B201 {}
|
||||
message B202 {}
|
||||
message B203 {}
|
||||
message B204 {}
|
||||
message B205 {}
|
||||
message B206 {}
|
||||
message B207 {}
|
||||
message B208 {}
|
||||
message B209 {}
|
||||
message B210 {}
|
||||
message B211 {}
|
||||
message B212 {}
|
||||
message B213 {}
|
||||
message B214 {}
|
||||
message B215 {}
|
||||
message B216 {}
|
||||
message B217 {}
|
||||
message B218 {}
|
||||
message B219 {}
|
||||
message B220 {}
|
||||
message B221 {}
|
||||
message B222 {}
|
||||
message B223 {}
|
||||
message B224 {}
|
||||
message B225 {}
|
||||
message B226 {}
|
||||
message B227 {}
|
||||
message B228 {}
|
||||
message B229 {}
|
||||
message B230 {}
|
||||
message B231 {}
|
||||
message B232 {}
|
||||
message B233 {}
|
||||
message B234 {}
|
||||
message B235 {}
|
||||
message B236 {}
|
||||
message B237 {}
|
||||
message B238 {}
|
||||
message B239 {}
|
||||
message B240 {}
|
||||
message B241 {}
|
||||
message B242 {}
|
||||
message B243 {}
|
||||
message B244 {}
|
||||
message B245 {}
|
||||
message B246 {}
|
||||
message B247 {}
|
||||
message B248 {}
|
||||
message B249 {}
|
||||
message B250 {}
|
||||
message B251 {}
|
||||
message B252 {}
|
||||
message B253 {}
|
||||
message B254 {}
|
||||
message B255 {}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,3 +1,33 @@
|
||||
// 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.
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
enum NoPackageEnum {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# 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'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf.internal import enum_type_wrapper
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -15,83 +15,27 @@ _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)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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.enum_types_by_name['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'
|
||||
_NOPACKAGEMESSAGE = DESCRIPTOR.message_types_by_name['NoPackageMessage']
|
||||
NoPackageMessage = _reflection.GeneratedProtocolMessageType('NoPackageMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _NOPACKAGEMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.no_package_pb2'
|
||||
# @@protoc_insertion_point(class_scope:NoPackageMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(NoPackageMessage)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_NOPACKAGEENUM._serialized_start=106
|
||||
_NOPACKAGEENUM._serialized_end=169
|
||||
_NOPACKAGEMESSAGE._serialized_start=45
|
||||
_NOPACKAGEMESSAGE._serialized_end=104
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/packed_field_test.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,321 +14,62 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
|
||||
_TESTPACKEDTYPES_NESTEDENUM = _descriptor.EnumDescriptor(
|
||||
name='NestedEnum',
|
||||
full_name='google.protobuf.python.internal.TestPackedTypes.NestedEnum',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
values=[
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='FOO', index=0, number=0,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAR', index=1, number=1,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
_descriptor.EnumValueDescriptor(
|
||||
name='BAZ', index=2, number=2,
|
||||
serialized_options=None,
|
||||
type=None),
|
||||
],
|
||||
containing_type=None,
|
||||
serialized_options=None,
|
||||
serialized_start=522,
|
||||
serialized_end=561,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_TESTPACKEDTYPES_NESTEDENUM)
|
||||
|
||||
|
||||
_TESTPACKEDTYPES = _descriptor.Descriptor(
|
||||
name='TestPackedTypes',
|
||||
full_name='google.protobuf.python.internal.TestPackedTypes',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int32', full_name='google.protobuf.python.internal.TestPackedTypes.repeated_int32', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
_TESTPACKEDTYPES_NESTEDENUM,
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=86,
|
||||
serialized_end=561,
|
||||
)
|
||||
|
||||
|
||||
_TESTUNPACKEDTYPES = _descriptor.Descriptor(
|
||||
name='TestUnpackedTypes',
|
||||
full_name='google.protobuf.python.internal.TestUnpackedTypes',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_int32', full_name='google.protobuf.python.internal.TestUnpackedTypes.repeated_int32', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=_b('\020\000'), file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto3',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=564,
|
||||
serialized_end=1056,
|
||||
)
|
||||
|
||||
_TESTPACKEDTYPES.fields_by_name['repeated_nested_enum'].enum_type = _TESTPACKEDTYPES_NESTEDENUM
|
||||
_TESTPACKEDTYPES_NESTEDENUM.containing_type = _TESTPACKEDTYPES
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum'].enum_type = _TESTPACKEDTYPES_NESTEDENUM
|
||||
DESCRIPTOR.message_types_by_name['TestPackedTypes'] = _TESTPACKEDTYPES
|
||||
DESCRIPTOR.message_types_by_name['TestUnpackedTypes'] = _TESTUNPACKEDTYPES
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestPackedTypes = _reflection.GeneratedProtocolMessageType('TestPackedTypes', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTPACKEDTYPES,
|
||||
__module__ = 'google.protobuf.internal.packed_field_test_pb2'
|
||||
_TESTPACKEDTYPES = DESCRIPTOR.message_types_by_name['TestPackedTypes']
|
||||
_TESTUNPACKEDTYPES = DESCRIPTOR.message_types_by_name['TestUnpackedTypes']
|
||||
_TESTPACKEDTYPES_NESTEDENUM = _TESTPACKEDTYPES.enum_types_by_name['NestedEnum']
|
||||
TestPackedTypes = _reflection.GeneratedProtocolMessageType('TestPackedTypes', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTPACKEDTYPES,
|
||||
'__module__' : 'google.protobuf.internal.packed_field_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestPackedTypes)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestPackedTypes)
|
||||
|
||||
TestUnpackedTypes = _reflection.GeneratedProtocolMessageType('TestUnpackedTypes', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTUNPACKEDTYPES,
|
||||
__module__ = 'google.protobuf.internal.packed_field_test_pb2'
|
||||
TestUnpackedTypes = _reflection.GeneratedProtocolMessageType('TestUnpackedTypes', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTUNPACKEDTYPES,
|
||||
'__module__' : 'google.protobuf.internal.packed_field_test_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestUnpackedTypes)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestUnpackedTypes)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
_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
|
||||
DESCRIPTOR._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int32']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_int64']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint32']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_uint64']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint32']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sint64']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed32']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_fixed64']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed32']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_sfixed64']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_float']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_double']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_bool']._serialized_options = b'\020\000'
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum']._options = None
|
||||
_TESTUNPACKEDTYPES.fields_by_name['repeated_nested_enum']._serialized_options = b'\020\000'
|
||||
_TESTPACKEDTYPES._serialized_start=86
|
||||
_TESTPACKEDTYPES._serialized_end=561
|
||||
_TESTPACKEDTYPES_NESTEDENUM._serialized_start=522
|
||||
_TESTPACKEDTYPES_NESTEDENUM._serialized_end=561
|
||||
_TESTUNPACKEDTYPES._serialized_start=564
|
||||
_TESTUNPACKEDTYPES._serialized_end=1056
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -32,16 +30,14 @@
|
||||
|
||||
"""Tests for google.protobuf.proto_builder."""
|
||||
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from ordereddict import OrderedDict #PY26
|
||||
import collections
|
||||
try:
|
||||
import unittest2 as unittest
|
||||
except ImportError:
|
||||
import unittest
|
||||
|
||||
from google.protobuf import descriptor_pb2
|
||||
from google.protobuf import descriptor_pb2 # pylint: disable=g-import-not-at-top
|
||||
from google.protobuf import descriptor
|
||||
from google.protobuf import descriptor_pool
|
||||
from google.protobuf import proto_builder
|
||||
from google.protobuf import text_format
|
||||
@@ -50,7 +46,7 @@ from google.protobuf import text_format
|
||||
class ProtoBuilderTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.ordered_fields = OrderedDict([
|
||||
self.ordered_fields = collections.OrderedDict([
|
||||
('foo', descriptor_pb2.FieldDescriptorProto.TYPE_INT64),
|
||||
('bar', descriptor_pb2.FieldDescriptorProto.TYPE_STRING),
|
||||
])
|
||||
@@ -91,6 +87,23 @@ class ProtoBuilderTest(unittest.TestCase):
|
||||
pool=pool)
|
||||
self.assertIs(proto_cls1.DESCRIPTOR, proto_cls2.DESCRIPTOR)
|
||||
|
||||
def testMakeLargeProtoClass(self):
|
||||
"""Test that large created protos don't use reserved field numbers."""
|
||||
num_fields = 123456
|
||||
fields = {
|
||||
'foo%d' % i: descriptor_pb2.FieldDescriptorProto.TYPE_INT64
|
||||
for i in range(num_fields)
|
||||
}
|
||||
proto_cls = proto_builder.MakeSimpleProtoClass(
|
||||
fields,
|
||||
full_name='net.proto2.python.public.proto_builder_test.LargeProtoTest')
|
||||
|
||||
reserved_field_numbers = set(
|
||||
range(descriptor.FieldDescriptor.FIRST_RESERVED_FIELD_NUMBER,
|
||||
descriptor.FieldDescriptor.LAST_RESERVED_FIELD_NUMBER + 1))
|
||||
proto_field_numbers = set(proto_cls.DESCRIPTOR.fields_by_number)
|
||||
self.assertFalse(reserved_field_numbers.intersection(proto_field_numbers))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Executable → Regular
+184
-204
@@ -55,14 +55,13 @@ import struct
|
||||
import sys
|
||||
import weakref
|
||||
|
||||
import six
|
||||
|
||||
# We use "as" to avoid name collisions with variables.
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import containers
|
||||
from google.protobuf.internal import decoder
|
||||
from google.protobuf.internal import encoder
|
||||
from google.protobuf.internal import enum_type_wrapper
|
||||
from google.protobuf.internal import extension_dict
|
||||
from google.protobuf.internal import message_listener as message_listener_mod
|
||||
from google.protobuf.internal import type_checkers
|
||||
from google.protobuf.internal import well_known_types
|
||||
@@ -73,7 +72,7 @@ from google.protobuf import text_format
|
||||
|
||||
_FieldDescriptor = descriptor_mod.FieldDescriptor
|
||||
_AnyFullTypeName = 'google.protobuf.Any'
|
||||
|
||||
_ExtensionDict = extension_dict._ExtensionDict
|
||||
|
||||
class GeneratedProtocolMessageType(type):
|
||||
|
||||
@@ -122,8 +121,30 @@ class GeneratedProtocolMessageType(type):
|
||||
|
||||
Returns:
|
||||
Newly-allocated class.
|
||||
|
||||
Raises:
|
||||
RuntimeError: Generated code only work with python cpp extension.
|
||||
"""
|
||||
descriptor = dictionary[GeneratedProtocolMessageType._DESCRIPTOR_KEY]
|
||||
|
||||
if isinstance(descriptor, str):
|
||||
raise RuntimeError('The generated code only work with python cpp '
|
||||
'extension, but it is using pure python runtime.')
|
||||
|
||||
# If a concrete class already exists for this descriptor, don't try to
|
||||
# create another. Doing so will break any messages that already exist with
|
||||
# the existing class.
|
||||
#
|
||||
# The C++ implementation appears to have its own internal `PyMessageFactory`
|
||||
# to achieve similar results.
|
||||
#
|
||||
# This most commonly happens in `text_format.py` when using descriptors from
|
||||
# a custom pool; it calls symbol_database.Global().getPrototype() on a
|
||||
# descriptor which already has an existing concrete class.
|
||||
new_class = getattr(descriptor, '_concrete_class', None)
|
||||
if new_class:
|
||||
return new_class
|
||||
|
||||
if descriptor.full_name in well_known_types.WKTBASES:
|
||||
bases += (well_known_types.WKTBASES[descriptor.full_name],)
|
||||
_AddClassAttributesForNestedExtensions(descriptor, dictionary)
|
||||
@@ -151,6 +172,16 @@ class GeneratedProtocolMessageType(type):
|
||||
type.
|
||||
"""
|
||||
descriptor = dictionary[GeneratedProtocolMessageType._DESCRIPTOR_KEY]
|
||||
|
||||
# If this is an _existing_ class looked up via `_concrete_class` in the
|
||||
# __new__ method above, then we don't need to re-initialize anything.
|
||||
existing_class = getattr(descriptor, '_concrete_class', None)
|
||||
if existing_class:
|
||||
assert existing_class is cls, (
|
||||
'Duplicate `GeneratedProtocolMessageType` created for descriptor %r'
|
||||
% (descriptor.full_name))
|
||||
return
|
||||
|
||||
cls._decoders_by_tag = {}
|
||||
if (descriptor.has_options and
|
||||
descriptor.GetOptions().message_set_wire_format):
|
||||
@@ -211,28 +242,6 @@ def _PropertyName(proto_field_name):
|
||||
return proto_field_name
|
||||
|
||||
|
||||
def _VerifyExtensionHandle(message, extension_handle):
|
||||
"""Verify that the given extension handle is valid."""
|
||||
|
||||
if not isinstance(extension_handle, _FieldDescriptor):
|
||||
raise KeyError('HasExtension() expects an extension handle, got: %s' %
|
||||
extension_handle)
|
||||
|
||||
if not extension_handle.is_extension:
|
||||
raise KeyError('"%s" is not an extension.' % extension_handle.full_name)
|
||||
|
||||
if not extension_handle.containing_type:
|
||||
raise KeyError('"%s" is missing a containing_type.'
|
||||
% extension_handle.full_name)
|
||||
|
||||
if extension_handle.containing_type is not message.DESCRIPTOR:
|
||||
raise KeyError('Extension "%s" extends message type "%s", but this '
|
||||
'message is of type "%s".' %
|
||||
(extension_handle.full_name,
|
||||
extension_handle.containing_type.full_name,
|
||||
message.DESCRIPTOR.full_name))
|
||||
|
||||
|
||||
def _AddSlots(message_descriptor, dictionary):
|
||||
"""Adds a __slots__ entry to dictionary, containing the names of all valid
|
||||
attributes for this message type.
|
||||
@@ -245,6 +254,7 @@ def _AddSlots(message_descriptor, dictionary):
|
||||
'_cached_byte_size_dirty',
|
||||
'_fields',
|
||||
'_unknown_fields',
|
||||
'_unknown_field_set',
|
||||
'_is_present_in_parent',
|
||||
'_listener',
|
||||
'_listener_for_children',
|
||||
@@ -267,7 +277,7 @@ def _IsMapField(field):
|
||||
|
||||
|
||||
def _IsMessageMapField(field):
|
||||
value_type = field.message_type.fields_by_name["value"]
|
||||
value_type = field.message_type.fields_by_name['value']
|
||||
return value_type.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE
|
||||
|
||||
|
||||
@@ -275,14 +285,15 @@ def _AttachFieldHelpers(cls, field_descriptor):
|
||||
is_repeated = (field_descriptor.label == _FieldDescriptor.LABEL_REPEATED)
|
||||
is_packable = (is_repeated and
|
||||
wire_format.IsTypePackable(field_descriptor.type))
|
||||
is_proto3 = field_descriptor.containing_type.syntax == 'proto3'
|
||||
if not is_packable:
|
||||
is_packed = False
|
||||
elif field_descriptor.containing_type.syntax == "proto2":
|
||||
elif field_descriptor.containing_type.syntax == 'proto2':
|
||||
is_packed = (field_descriptor.has_options and
|
||||
field_descriptor.GetOptions().packed)
|
||||
else:
|
||||
has_packed_false = (field_descriptor.has_options and
|
||||
field_descriptor.GetOptions().HasField("packed") and
|
||||
field_descriptor.GetOptions().HasField('packed') and
|
||||
field_descriptor.GetOptions().packed == False)
|
||||
is_packed = not has_packed_false
|
||||
is_map_entry = _IsMapField(field_descriptor)
|
||||
@@ -313,8 +324,12 @@ def _AttachFieldHelpers(cls, field_descriptor):
|
||||
decode_type = _FieldDescriptor.TYPE_INT32
|
||||
|
||||
oneof_descriptor = None
|
||||
clear_if_default = False
|
||||
if field_descriptor.containing_oneof is not None:
|
||||
oneof_descriptor = field_descriptor
|
||||
elif (is_proto3 and not is_repeated and
|
||||
field_descriptor.cpp_type != _FieldDescriptor.CPPTYPE_MESSAGE):
|
||||
clear_if_default = True
|
||||
|
||||
if is_map_entry:
|
||||
is_message_map = _IsMessageMapField(field_descriptor)
|
||||
@@ -322,10 +337,21 @@ def _AttachFieldHelpers(cls, field_descriptor):
|
||||
field_decoder = decoder.MapDecoder(
|
||||
field_descriptor, _GetInitializeDefaultForMap(field_descriptor),
|
||||
is_message_map)
|
||||
elif decode_type == _FieldDescriptor.TYPE_STRING:
|
||||
field_decoder = decoder.StringDecoder(
|
||||
field_descriptor.number, is_repeated, is_packed,
|
||||
field_descriptor, field_descriptor._default_constructor,
|
||||
clear_if_default)
|
||||
elif field_descriptor.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
field_decoder = type_checkers.TYPE_TO_DECODER[decode_type](
|
||||
field_descriptor.number, is_repeated, is_packed,
|
||||
field_descriptor, field_descriptor._default_constructor)
|
||||
else:
|
||||
field_decoder = type_checkers.TYPE_TO_DECODER[decode_type](
|
||||
field_descriptor.number, is_repeated, is_packed,
|
||||
field_descriptor, field_descriptor._default_constructor)
|
||||
field_descriptor.number, is_repeated, is_packed,
|
||||
# pylint: disable=protected-access
|
||||
field_descriptor, field_descriptor._default_constructor,
|
||||
clear_if_default)
|
||||
|
||||
cls._decoders_by_tag[tag_bytes] = (field_decoder, oneof_descriptor)
|
||||
|
||||
@@ -339,8 +365,8 @@ def _AttachFieldHelpers(cls, field_descriptor):
|
||||
|
||||
|
||||
def _AddClassAttributesForNestedExtensions(descriptor, dictionary):
|
||||
extension_dict = descriptor.extensions_by_name
|
||||
for extension_name, extension_field in extension_dict.items():
|
||||
extensions = descriptor.extensions_by_name
|
||||
for extension_name, extension_field in extensions.items():
|
||||
assert extension_name not in dictionary
|
||||
dictionary[extension_name] = extension_field
|
||||
|
||||
@@ -422,6 +448,9 @@ def _DefaultValueConstructorForField(field):
|
||||
# _concrete_class may not yet be initialized.
|
||||
message_type = field.message_type
|
||||
def MakeSubMessageDefault(message):
|
||||
assert getattr(message_type, '_concrete_class', None), (
|
||||
'Uninitialized concrete class found for field %r (message type %r)'
|
||||
% (field.full_name, message_type.full_name))
|
||||
result = message_type._concrete_class()
|
||||
result._SetListener(
|
||||
_OneofListener(message, field)
|
||||
@@ -445,7 +474,7 @@ def _ReraiseTypeErrorWithFieldName(message_name, field_name):
|
||||
exc = TypeError('%s for field %s.%s' % (str(exc), message_name, field_name))
|
||||
|
||||
# re-raise possibly-amended exception with original traceback:
|
||||
six.reraise(type(exc), exc, sys.exc_info()[2])
|
||||
raise exc.with_traceback(sys.exc_info()[2])
|
||||
|
||||
|
||||
def _AddInitMethod(message_descriptor, cls):
|
||||
@@ -458,7 +487,7 @@ def _AddInitMethod(message_descriptor, cls):
|
||||
enum_type with the same name. If the value is not a string, it's
|
||||
returned as-is. (No conversion or bounds-checking is done.)
|
||||
"""
|
||||
if isinstance(value, six.string_types):
|
||||
if isinstance(value, str):
|
||||
try:
|
||||
return enum_type.values_by_name[value].number
|
||||
except KeyError:
|
||||
@@ -477,13 +506,16 @@ def _AddInitMethod(message_descriptor, cls):
|
||||
# _unknown_fields is () when empty for efficiency, and will be turned into
|
||||
# a list if fields are added.
|
||||
self._unknown_fields = ()
|
||||
# _unknown_field_set is None when empty for efficiency, and will be
|
||||
# turned into UnknownFieldSet struct if fields are added.
|
||||
self._unknown_field_set = None # pylint: disable=protected-access
|
||||
self._is_present_in_parent = False
|
||||
self._listener = message_listener_mod.NullMessageListener()
|
||||
self._listener_for_children = _Listener(self)
|
||||
for field_name, field_value in kwargs.items():
|
||||
field = _GetFieldByName(message_descriptor, field_name)
|
||||
if field is None:
|
||||
raise TypeError("%s() got an unexpected keyword argument '%s'" %
|
||||
raise TypeError('%s() got an unexpected keyword argument "%s"' %
|
||||
(message_descriptor.name, field_name))
|
||||
if field_value is None:
|
||||
# field=None is the same as no field at all.
|
||||
@@ -573,7 +605,7 @@ def _AddPropertiesForField(field, cls):
|
||||
# handle specially here.
|
||||
assert _FieldDescriptor.MAX_CPPTYPE == 10
|
||||
|
||||
constant_name = field.name.upper() + "_FIELD_NUMBER"
|
||||
constant_name = field.name.upper() + '_FIELD_NUMBER'
|
||||
setattr(cls, constant_name, field.number)
|
||||
|
||||
if field.label == _FieldDescriptor.LABEL_REPEATED:
|
||||
@@ -584,10 +616,18 @@ def _AddPropertiesForField(field, cls):
|
||||
_AddPropertiesForNonRepeatedScalarField(field, cls)
|
||||
|
||||
|
||||
class _FieldProperty(property):
|
||||
__slots__ = ('DESCRIPTOR',)
|
||||
|
||||
def __init__(self, descriptor, getter, setter, doc):
|
||||
property.__init__(self, getter, setter, doc=doc)
|
||||
self.DESCRIPTOR = descriptor
|
||||
|
||||
|
||||
def _AddPropertiesForRepeatedField(field, cls):
|
||||
"""Adds a public property for a "repeated" protocol message field. Clients
|
||||
can use this property to get the value of the field, which will be either a
|
||||
_RepeatedScalarFieldContainer or _RepeatedCompositeFieldContainer (see
|
||||
RepeatedScalarFieldContainer or RepeatedCompositeFieldContainer (see
|
||||
below).
|
||||
|
||||
Note that when clients add values to these containers, we perform
|
||||
@@ -625,7 +665,7 @@ def _AddPropertiesForRepeatedField(field, cls):
|
||||
'"%s" in protocol message object.' % proto_field_name)
|
||||
|
||||
doc = 'Magic attribute generated for "%s" proto field.' % proto_field_name
|
||||
setattr(cls, property_name, property(getter, setter, doc=doc))
|
||||
setattr(cls, property_name, _FieldProperty(field, getter, setter, doc=doc))
|
||||
|
||||
|
||||
def _AddPropertiesForNonRepeatedScalarField(field, cls):
|
||||
@@ -643,8 +683,7 @@ def _AddPropertiesForNonRepeatedScalarField(field, cls):
|
||||
property_name = _PropertyName(proto_field_name)
|
||||
type_checker = type_checkers.GetTypeChecker(field)
|
||||
default_value = field.default_value
|
||||
valid_values = set()
|
||||
is_proto3 = field.containing_type.syntax == "proto3"
|
||||
is_proto3 = field.containing_type.syntax == 'proto3'
|
||||
|
||||
def getter(self):
|
||||
# TODO(protobuf-team): This may be broken since there may not be
|
||||
@@ -659,7 +698,11 @@ def _AddPropertiesForNonRepeatedScalarField(field, cls):
|
||||
# pylint: disable=protected-access
|
||||
# Testing the value for truthiness captures all of the proto3 defaults
|
||||
# (0, 0.0, enum 0, and False).
|
||||
new_value = type_checker.CheckValue(new_value)
|
||||
try:
|
||||
new_value = type_checker.CheckValue(new_value)
|
||||
except TypeError as e:
|
||||
raise TypeError(
|
||||
'Cannot set %s to %.1024r: %s' % (field.full_name, new_value, e))
|
||||
if clear_when_set_to_default and not new_value:
|
||||
self._fields.pop(field, None)
|
||||
else:
|
||||
@@ -681,7 +724,7 @@ def _AddPropertiesForNonRepeatedScalarField(field, cls):
|
||||
|
||||
# Add a property to encapsulate the getter/setter.
|
||||
doc = 'Magic attribute generated for "%s" proto field.' % proto_field_name
|
||||
setattr(cls, property_name, property(getter, setter, doc=doc))
|
||||
setattr(cls, property_name, _FieldProperty(field, getter, setter, doc=doc))
|
||||
|
||||
|
||||
def _AddPropertiesForNonRepeatedCompositeField(field, cls):
|
||||
@@ -725,14 +768,14 @@ def _AddPropertiesForNonRepeatedCompositeField(field, cls):
|
||||
|
||||
# Add a property to encapsulate the getter.
|
||||
doc = 'Magic attribute generated for "%s" proto field.' % proto_field_name
|
||||
setattr(cls, property_name, property(getter, setter, doc=doc))
|
||||
setattr(cls, property_name, _FieldProperty(field, getter, setter, doc=doc))
|
||||
|
||||
|
||||
def _AddPropertiesForExtensions(descriptor, cls):
|
||||
"""Adds properties for all fields in this protocol message type."""
|
||||
extension_dict = descriptor.extensions_by_name
|
||||
for extension_name, extension_field in extension_dict.items():
|
||||
constant_name = extension_name.upper() + "_FIELD_NUMBER"
|
||||
extensions = descriptor.extensions_by_name
|
||||
for extension_name, extension_field in extensions.items():
|
||||
constant_name = extension_name.upper() + '_FIELD_NUMBER'
|
||||
setattr(cls, constant_name, extension_field.number)
|
||||
|
||||
# TODO(amauryfa): Migrate all users of these attributes to functions like
|
||||
@@ -748,7 +791,8 @@ def _AddStaticMethods(cls):
|
||||
def RegisterExtension(extension_handle):
|
||||
extension_handle.containing_type = cls.DESCRIPTOR
|
||||
# TODO(amauryfa): Use cls.MESSAGE_FACTORY.pool when available.
|
||||
cls.DESCRIPTOR.file.pool.AddExtensionDescriptor(extension_handle)
|
||||
# pylint: disable=protected-access
|
||||
cls.DESCRIPTOR.file.pool._AddExtensionDescriptor(extension_handle)
|
||||
_AttachFieldHelpers(cls, extension_handle)
|
||||
cls.RegisterExtension = staticmethod(RegisterExtension)
|
||||
|
||||
@@ -781,14 +825,16 @@ def _AddListFieldsMethod(message_descriptor, cls):
|
||||
|
||||
cls.ListFields = ListFields
|
||||
|
||||
_Proto3HasError = 'Protocol message has no non-repeated submessage field "%s"'
|
||||
_Proto2HasError = 'Protocol message has no non-repeated field "%s"'
|
||||
_PROTO3_ERROR_TEMPLATE = \
|
||||
('Protocol message %s has no non-repeated submessage field "%s" '
|
||||
'nor marked as optional')
|
||||
_PROTO2_ERROR_TEMPLATE = 'Protocol message %s has no non-repeated field "%s"'
|
||||
|
||||
def _AddHasFieldMethod(message_descriptor, cls):
|
||||
"""Helper for _AddMessageMethods()."""
|
||||
|
||||
is_proto3 = (message_descriptor.syntax == "proto3")
|
||||
error_msg = _Proto3HasError if is_proto3 else _Proto2HasError
|
||||
error_msg = _PROTO3_ERROR_TEMPLATE if is_proto3 else _PROTO2_ERROR_TEMPLATE
|
||||
|
||||
hassable_fields = {}
|
||||
for field in message_descriptor.fields:
|
||||
@@ -800,16 +846,15 @@ def _AddHasFieldMethod(message_descriptor, cls):
|
||||
continue
|
||||
hassable_fields[field.name] = field
|
||||
|
||||
if not is_proto3:
|
||||
# Fields inside oneofs are never repeated (enforced by the compiler).
|
||||
for oneof in message_descriptor.oneofs:
|
||||
hassable_fields[oneof.name] = oneof
|
||||
# Has methods are supported for oneof descriptors.
|
||||
for oneof in message_descriptor.oneofs:
|
||||
hassable_fields[oneof.name] = oneof
|
||||
|
||||
def HasField(self, field_name):
|
||||
try:
|
||||
field = hassable_fields[field_name]
|
||||
except KeyError:
|
||||
raise ValueError(error_msg % field_name)
|
||||
raise ValueError(error_msg % (message_descriptor.full_name, field_name))
|
||||
|
||||
if isinstance(field, descriptor_mod.OneofDescriptor):
|
||||
try:
|
||||
@@ -839,7 +884,7 @@ def _AddClearFieldMethod(message_descriptor, cls):
|
||||
else:
|
||||
return
|
||||
except KeyError:
|
||||
raise ValueError('Protocol message %s() has no "%s" field.' %
|
||||
raise ValueError('Protocol message %s has no "%s" field.' %
|
||||
(message_descriptor.name, field_name))
|
||||
|
||||
if field in self._fields:
|
||||
@@ -867,7 +912,7 @@ def _AddClearFieldMethod(message_descriptor, cls):
|
||||
def _AddClearExtensionMethod(cls):
|
||||
"""Helper for _AddMessageMethods()."""
|
||||
def ClearExtension(self, extension_handle):
|
||||
_VerifyExtensionHandle(self, extension_handle)
|
||||
extension_dict._VerifyExtensionHandle(self, extension_handle)
|
||||
|
||||
# Similar to ClearField(), above.
|
||||
if extension_handle in self._fields:
|
||||
@@ -879,7 +924,7 @@ def _AddClearExtensionMethod(cls):
|
||||
def _AddHasExtensionMethod(cls):
|
||||
"""Helper for _AddMessageMethods()."""
|
||||
def HasExtension(self, extension_handle):
|
||||
_VerifyExtensionHandle(self, extension_handle)
|
||||
extension_dict._VerifyExtensionHandle(self, extension_handle)
|
||||
if extension_handle.label == _FieldDescriptor.LABEL_REPEATED:
|
||||
raise KeyError('"%s" is repeated.' % extension_handle.full_name)
|
||||
|
||||
@@ -949,12 +994,12 @@ def _AddEqualsMethod(message_descriptor, cls):
|
||||
if not self.ListFields() == other.ListFields():
|
||||
return False
|
||||
|
||||
# Sort unknown fields because their order shouldn't affect equality test.
|
||||
# TODO(jieluo): Fix UnknownFieldSet to consider MessageSet extensions,
|
||||
# then use it for the comparison.
|
||||
unknown_fields = list(self._unknown_fields)
|
||||
unknown_fields.sort()
|
||||
other_unknown_fields = list(other._unknown_fields)
|
||||
other_unknown_fields.sort()
|
||||
|
||||
return unknown_fields == other_unknown_fields
|
||||
|
||||
cls.__eq__ = __eq__
|
||||
@@ -1034,7 +1079,6 @@ def _AddSerializeToStringMethod(message_descriptor, cls):
|
||||
|
||||
def SerializeToString(self, **kwargs):
|
||||
# Check if the message has all of its required fields set.
|
||||
errors = []
|
||||
if not self.IsInitialized():
|
||||
raise message_mod.EncodeError(
|
||||
'Message %s is missing required fields: %s' % (
|
||||
@@ -1078,6 +1122,7 @@ def _AddSerializePartialToStringMethod(message_descriptor, cls):
|
||||
def _AddMergeFromStringMethod(message_descriptor, cls):
|
||||
"""Helper for _AddMessageMethods()."""
|
||||
def MergeFromString(self, serialized):
|
||||
serialized = memoryview(serialized)
|
||||
length = len(serialized)
|
||||
try:
|
||||
if self._InternalParse(serialized, 0, length) != length:
|
||||
@@ -1095,26 +1140,56 @@ def _AddMergeFromStringMethod(message_descriptor, cls):
|
||||
local_ReadTag = decoder.ReadTag
|
||||
local_SkipField = decoder.SkipField
|
||||
decoders_by_tag = cls._decoders_by_tag
|
||||
is_proto3 = message_descriptor.syntax == "proto3"
|
||||
|
||||
def InternalParse(self, buffer, pos, end):
|
||||
"""Create a message from serialized bytes.
|
||||
|
||||
Args:
|
||||
self: Message, instance of the proto message object.
|
||||
buffer: memoryview of the serialized data.
|
||||
pos: int, position to start in the serialized data.
|
||||
end: int, end position of the serialized data.
|
||||
|
||||
Returns:
|
||||
Message object.
|
||||
"""
|
||||
# Guard against internal misuse, since this function is called internally
|
||||
# quite extensively, and its easy to accidentally pass bytes.
|
||||
assert isinstance(buffer, memoryview)
|
||||
self._Modified()
|
||||
field_dict = self._fields
|
||||
unknown_field_list = self._unknown_fields
|
||||
# pylint: disable=protected-access
|
||||
unknown_field_set = self._unknown_field_set
|
||||
while pos != end:
|
||||
(tag_bytes, new_pos) = local_ReadTag(buffer, pos)
|
||||
field_decoder, field_desc = decoders_by_tag.get(tag_bytes, (None, None))
|
||||
if field_decoder is None:
|
||||
value_start_pos = new_pos
|
||||
new_pos = local_SkipField(buffer, new_pos, end, tag_bytes)
|
||||
if not self._unknown_fields: # pylint: disable=protected-access
|
||||
self._unknown_fields = [] # pylint: disable=protected-access
|
||||
if unknown_field_set is None:
|
||||
# pylint: disable=protected-access
|
||||
self._unknown_field_set = containers.UnknownFieldSet()
|
||||
# pylint: disable=protected-access
|
||||
unknown_field_set = self._unknown_field_set
|
||||
# pylint: disable=protected-access
|
||||
(tag, _) = decoder._DecodeVarint(tag_bytes, 0)
|
||||
field_number, wire_type = wire_format.UnpackTag(tag)
|
||||
if field_number == 0:
|
||||
raise message_mod.DecodeError('Field number 0 is illegal.')
|
||||
# TODO(jieluo): remove old_pos.
|
||||
old_pos = new_pos
|
||||
(data, new_pos) = decoder._DecodeUnknownField(
|
||||
buffer, new_pos, wire_type) # pylint: disable=protected-access
|
||||
if new_pos == -1:
|
||||
return pos
|
||||
if (not is_proto3 or
|
||||
api_implementation.GetPythonProto3PreserveUnknownsDefault()):
|
||||
if not unknown_field_list:
|
||||
unknown_field_list = self._unknown_fields = []
|
||||
unknown_field_list.append(
|
||||
(tag_bytes, buffer[value_start_pos:new_pos]))
|
||||
# pylint: disable=protected-access
|
||||
unknown_field_set._add(field_number, wire_type, data)
|
||||
# TODO(jieluo): remove _unknown_fields.
|
||||
new_pos = local_SkipField(buffer, old_pos, end, tag_bytes)
|
||||
if new_pos == -1:
|
||||
return pos
|
||||
self._unknown_fields.append(
|
||||
(tag_bytes, buffer[old_pos:new_pos].tobytes()))
|
||||
pos = new_pos
|
||||
else:
|
||||
pos = field_decoder(buffer, new_pos, end, self, field_dict)
|
||||
@@ -1189,7 +1264,7 @@ def _AddIsInitializedMethod(message_descriptor, cls):
|
||||
for field, value in self.ListFields():
|
||||
if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
if field.is_extension:
|
||||
name = "(%s)" % field.full_name
|
||||
name = '(%s)' % field.full_name
|
||||
else:
|
||||
name = field.name
|
||||
|
||||
@@ -1197,7 +1272,7 @@ def _AddIsInitializedMethod(message_descriptor, cls):
|
||||
if _IsMessageMapField(field):
|
||||
for key in value:
|
||||
element = value[key]
|
||||
prefix = "%s[%s]." % (name, key)
|
||||
prefix = '%s[%s].' % (name, key)
|
||||
sub_errors = element.FindInitializationErrors()
|
||||
errors += [prefix + error for error in sub_errors]
|
||||
else:
|
||||
@@ -1206,11 +1281,11 @@ def _AddIsInitializedMethod(message_descriptor, cls):
|
||||
elif field.label == _FieldDescriptor.LABEL_REPEATED:
|
||||
for i in range(len(value)):
|
||||
element = value[i]
|
||||
prefix = "%s[%d]." % (name, i)
|
||||
prefix = '%s[%d].' % (name, i)
|
||||
sub_errors = element.FindInitializationErrors()
|
||||
errors += [prefix + error for error in sub_errors]
|
||||
else:
|
||||
prefix = name + "."
|
||||
prefix = name + '.'
|
||||
sub_errors = value.FindInitializationErrors()
|
||||
errors += [prefix + error for error in sub_errors]
|
||||
|
||||
@@ -1219,6 +1294,14 @@ def _AddIsInitializedMethod(message_descriptor, cls):
|
||||
cls.FindInitializationErrors = FindInitializationErrors
|
||||
|
||||
|
||||
def _FullyQualifiedClassName(klass):
|
||||
module = klass.__module__
|
||||
name = getattr(klass, '__qualname__', klass.__name__)
|
||||
if module in (None, 'builtins', '__builtin__'):
|
||||
return name
|
||||
return module + '.' + name
|
||||
|
||||
|
||||
def _AddMergeFromMethod(cls):
|
||||
LABEL_REPEATED = _FieldDescriptor.LABEL_REPEATED
|
||||
CPPTYPE_MESSAGE = _FieldDescriptor.CPPTYPE_MESSAGE
|
||||
@@ -1226,8 +1309,9 @@ def _AddMergeFromMethod(cls):
|
||||
def MergeFrom(self, msg):
|
||||
if not isinstance(msg, cls):
|
||||
raise TypeError(
|
||||
"Parameter to MergeFrom() must be instance of same class: "
|
||||
'expected %s got %s.' % (cls.__name__, msg.__class__.__name__))
|
||||
'Parameter to MergeFrom() must be instance of same class: '
|
||||
'expected %s got %s.' % (_FullyQualifiedClassName(cls),
|
||||
_FullyQualifiedClassName(msg.__class__)))
|
||||
|
||||
assert msg is not self
|
||||
self._Modified()
|
||||
@@ -1259,6 +1343,10 @@ def _AddMergeFromMethod(cls):
|
||||
if not self._unknown_fields:
|
||||
self._unknown_fields = []
|
||||
self._unknown_fields.extend(msg._unknown_fields)
|
||||
# pylint: disable=protected-access
|
||||
if self._unknown_field_set is None:
|
||||
self._unknown_field_set = containers.UnknownFieldSet()
|
||||
self._unknown_field_set._extend(msg._unknown_field_set)
|
||||
|
||||
cls.MergeFrom = MergeFrom
|
||||
|
||||
@@ -1281,25 +1369,36 @@ def _AddWhichOneofMethod(message_descriptor, cls):
|
||||
cls.WhichOneof = WhichOneof
|
||||
|
||||
|
||||
def _AddReduceMethod(cls):
|
||||
def __reduce__(self): # pylint: disable=invalid-name
|
||||
return (type(self), (), self.__getstate__())
|
||||
cls.__reduce__ = __reduce__
|
||||
|
||||
|
||||
def _Clear(self):
|
||||
# Clear fields.
|
||||
self._fields = {}
|
||||
self._unknown_fields = ()
|
||||
# pylint: disable=protected-access
|
||||
if self._unknown_field_set is not None:
|
||||
self._unknown_field_set._clear()
|
||||
self._unknown_field_set = None
|
||||
|
||||
self._oneofs = {}
|
||||
self._Modified()
|
||||
|
||||
|
||||
def _UnknownFields(self):
|
||||
if self._unknown_field_set is None: # pylint: disable=protected-access
|
||||
# pylint: disable=protected-access
|
||||
self._unknown_field_set = containers.UnknownFieldSet()
|
||||
return self._unknown_field_set # pylint: disable=protected-access
|
||||
|
||||
|
||||
def _DiscardUnknownFields(self):
|
||||
self._unknown_fields = []
|
||||
self._unknown_field_set = None # pylint: disable=protected-access
|
||||
for field, value in self.ListFields():
|
||||
if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
if field.label == _FieldDescriptor.LABEL_REPEATED:
|
||||
if _IsMapField(field):
|
||||
if _IsMessageMapField(field):
|
||||
for key in value:
|
||||
value[key].DiscardUnknownFields()
|
||||
elif field.label == _FieldDescriptor.LABEL_REPEATED:
|
||||
for sub_message in value:
|
||||
sub_message.DiscardUnknownFields()
|
||||
else:
|
||||
@@ -1332,9 +1431,9 @@ def _AddMessageMethods(message_descriptor, cls):
|
||||
_AddIsInitializedMethod(message_descriptor, cls)
|
||||
_AddMergeFromMethod(cls)
|
||||
_AddWhichOneofMethod(message_descriptor, cls)
|
||||
_AddReduceMethod(cls)
|
||||
# Adds methods which do not depend on cls.
|
||||
cls.Clear = _Clear
|
||||
cls.UnknownFields = _UnknownFields
|
||||
cls.DiscardUnknownFields = _DiscardUnknownFields
|
||||
cls._SetListener = _SetListener
|
||||
|
||||
@@ -1438,122 +1537,3 @@ class _OneofListener(_Listener):
|
||||
super(_OneofListener, self).Modified()
|
||||
except ReferenceError:
|
||||
pass
|
||||
|
||||
|
||||
# TODO(robinson): Move elsewhere? This file is getting pretty ridiculous...
|
||||
# TODO(robinson): Unify error handling of "unknown extension" crap.
|
||||
# TODO(robinson): Support iteritems()-style iteration over all
|
||||
# extensions with the "has" bits turned on?
|
||||
class _ExtensionDict(object):
|
||||
|
||||
"""Dict-like container for supporting an indexable "Extensions"
|
||||
field on proto instances.
|
||||
|
||||
Note that in all cases we expect extension handles to be
|
||||
FieldDescriptors.
|
||||
"""
|
||||
|
||||
def __init__(self, extended_message):
|
||||
"""extended_message: Message instance for which we are the Extensions dict.
|
||||
"""
|
||||
|
||||
self._extended_message = extended_message
|
||||
|
||||
def __getitem__(self, extension_handle):
|
||||
"""Returns the current value of the given extension handle."""
|
||||
|
||||
_VerifyExtensionHandle(self._extended_message, extension_handle)
|
||||
|
||||
result = self._extended_message._fields.get(extension_handle)
|
||||
if result is not None:
|
||||
return result
|
||||
|
||||
if extension_handle.label == _FieldDescriptor.LABEL_REPEATED:
|
||||
result = extension_handle._default_constructor(self._extended_message)
|
||||
elif extension_handle.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
result = extension_handle.message_type._concrete_class()
|
||||
try:
|
||||
result._SetListener(self._extended_message._listener_for_children)
|
||||
except ReferenceError:
|
||||
pass
|
||||
else:
|
||||
# Singular scalar -- just return the default without inserting into the
|
||||
# dict.
|
||||
return extension_handle.default_value
|
||||
|
||||
# Atomically check if another thread has preempted us and, if not, swap
|
||||
# in the new object we just created. If someone has preempted us, we
|
||||
# take that object and discard ours.
|
||||
# WARNING: We are relying on setdefault() being atomic. This is true
|
||||
# in CPython but we haven't investigated others. This warning appears
|
||||
# in several other locations in this file.
|
||||
result = self._extended_message._fields.setdefault(
|
||||
extension_handle, result)
|
||||
|
||||
return result
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, self.__class__):
|
||||
return False
|
||||
|
||||
my_fields = self._extended_message.ListFields()
|
||||
other_fields = other._extended_message.ListFields()
|
||||
|
||||
# Get rid of non-extension fields.
|
||||
my_fields = [ field for field in my_fields if field.is_extension ]
|
||||
other_fields = [ field for field in other_fields if field.is_extension ]
|
||||
|
||||
return my_fields == other_fields
|
||||
|
||||
def __ne__(self, other):
|
||||
return not self == other
|
||||
|
||||
def __hash__(self):
|
||||
raise TypeError('unhashable object')
|
||||
|
||||
# Note that this is only meaningful for non-repeated, scalar extension
|
||||
# fields. Note also that we may have to call _Modified() when we do
|
||||
# successfully set a field this way, to set any necssary "has" bits in the
|
||||
# ancestors of the extended message.
|
||||
def __setitem__(self, extension_handle, value):
|
||||
"""If extension_handle specifies a non-repeated, scalar extension
|
||||
field, sets the value of that field.
|
||||
"""
|
||||
|
||||
_VerifyExtensionHandle(self._extended_message, extension_handle)
|
||||
|
||||
if (extension_handle.label == _FieldDescriptor.LABEL_REPEATED or
|
||||
extension_handle.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE):
|
||||
raise TypeError(
|
||||
'Cannot assign to extension "%s" because it is a repeated or '
|
||||
'composite type.' % extension_handle.full_name)
|
||||
|
||||
# It's slightly wasteful to lookup the type checker each time,
|
||||
# but we expect this to be a vanishingly uncommon case anyway.
|
||||
type_checker = type_checkers.GetTypeChecker(extension_handle)
|
||||
# pylint: disable=protected-access
|
||||
self._extended_message._fields[extension_handle] = (
|
||||
type_checker.CheckValue(value))
|
||||
self._extended_message._Modified()
|
||||
|
||||
def _FindExtensionByName(self, name):
|
||||
"""Tries to find a known extension with the specified name.
|
||||
|
||||
Args:
|
||||
name: Extension full name.
|
||||
|
||||
Returns:
|
||||
Extension field descriptor.
|
||||
"""
|
||||
return self._extended_message._extensions_by_name.get(name, None)
|
||||
|
||||
def _FindExtensionByNumber(self, number):
|
||||
"""Tries to find a known extension with the field number.
|
||||
|
||||
Args:
|
||||
number: Extension field number.
|
||||
|
||||
Returns:
|
||||
Extension field descriptor.
|
||||
"""
|
||||
return self._extended_message._extensions_by_number.get(number, None)
|
||||
@@ -36,12 +36,8 @@ namespace google {
|
||||
namespace protobuf {
|
||||
namespace python {
|
||||
|
||||
static const Message* GetCProtoInsidePyProtoStub(PyObject* msg) {
|
||||
return NULL;
|
||||
}
|
||||
static Message* MutableCProtoInsidePyProtoStub(PyObject* msg) {
|
||||
return NULL;
|
||||
}
|
||||
static const Message* GetCProtoInsidePyProtoStub(PyObject* msg) { return NULL; }
|
||||
static Message* MutableCProtoInsidePyProtoStub(PyObject* msg) { return NULL; }
|
||||
|
||||
// This is initialized with a default, stub implementation.
|
||||
// If python-google.protobuf.cc is loaded, the function pointer is overridden
|
||||
|
||||
Executable → Regular
+1057
-784
File diff suppressed because it is too large.
Load diff
Executable → Regular
+1
-6
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -35,10 +33,7 @@
|
||||
__author__ = 'petar@google.com (Petar Petrov)'
|
||||
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import service_reflection
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -32,10 +30,7 @@
|
||||
|
||||
"""Tests for google.protobuf.symbol_database."""
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import descriptor
|
||||
|
||||
@@ -43,10 +43,10 @@ message TestBadIdentifiers {
|
||||
// Make sure these reasonable extension names don't conflict with internal
|
||||
// variables.
|
||||
extend TestBadIdentifiers {
|
||||
optional string message = 100 [default="foo"];
|
||||
optional string descriptor = 101 [default="bar"];
|
||||
optional string reflection = 102 [default="baz"];
|
||||
optional string service = 103 [default="qux"];
|
||||
optional string message = 100 [default = "foo"];
|
||||
optional string descriptor = 101 [default = "bar"];
|
||||
optional string reflection = 102 [default = "baz"];
|
||||
optional string service = 103 [default = "qux"];
|
||||
}
|
||||
|
||||
message AnotherMessage {}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/test_bad_identifiers.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -16,139 +16,49 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
MESSAGE_FIELD_NUMBER = 100
|
||||
message = _descriptor.FieldDescriptor(
|
||||
name='message', full_name='protobuf_unittest.message', index=0,
|
||||
number=100, type=9, cpp_type=9, label=1,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
message = DESCRIPTOR.extensions_by_name['message']
|
||||
DESCRIPTOR_FIELD_NUMBER = 101
|
||||
descriptor = _descriptor.FieldDescriptor(
|
||||
name='descriptor', full_name='protobuf_unittest.descriptor', index=1,
|
||||
number=101, type=9, cpp_type=9, label=1,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
descriptor = DESCRIPTOR.extensions_by_name['descriptor']
|
||||
REFLECTION_FIELD_NUMBER = 102
|
||||
reflection = _descriptor.FieldDescriptor(
|
||||
name='reflection', full_name='protobuf_unittest.reflection', index=2,
|
||||
number=102, type=9, cpp_type=9, label=1,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
reflection = DESCRIPTOR.extensions_by_name['reflection']
|
||||
SERVICE_FIELD_NUMBER = 103
|
||||
service = _descriptor.FieldDescriptor(
|
||||
name='service', full_name='protobuf_unittest.service', index=3,
|
||||
number=103, type=9, cpp_type=9, label=1,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
service = DESCRIPTOR.extensions_by_name['service']
|
||||
|
||||
|
||||
_TESTBADIDENTIFIERS = _descriptor.Descriptor(
|
||||
name='TestBadIdentifiers',
|
||||
full_name='protobuf_unittest.TestBadIdentifiers',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(100, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=74,
|
||||
serialized_end=104,
|
||||
)
|
||||
|
||||
|
||||
_ANOTHERMESSAGE = _descriptor.Descriptor(
|
||||
name='AnotherMessage',
|
||||
full_name='protobuf_unittest.AnotherMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=106,
|
||||
serialized_end=122,
|
||||
)
|
||||
|
||||
DESCRIPTOR.message_types_by_name['TestBadIdentifiers'] = _TESTBADIDENTIFIERS
|
||||
DESCRIPTOR.message_types_by_name['AnotherMessage'] = _ANOTHERMESSAGE
|
||||
DESCRIPTOR.extensions_by_name['message'] = message
|
||||
DESCRIPTOR.extensions_by_name['descriptor'] = descriptor
|
||||
DESCRIPTOR.extensions_by_name['reflection'] = reflection
|
||||
DESCRIPTOR.extensions_by_name['service'] = service
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestBadIdentifiers = _reflection.GeneratedProtocolMessageType('TestBadIdentifiers', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTBADIDENTIFIERS,
|
||||
__module__ = 'google.protobuf.internal.test_bad_identifiers_pb2'
|
||||
_TESTBADIDENTIFIERS = DESCRIPTOR.message_types_by_name['TestBadIdentifiers']
|
||||
_ANOTHERMESSAGE = DESCRIPTOR.message_types_by_name['AnotherMessage']
|
||||
TestBadIdentifiers = _reflection.GeneratedProtocolMessageType('TestBadIdentifiers', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTBADIDENTIFIERS,
|
||||
'__module__' : 'google.protobuf.internal.test_bad_identifiers_pb2'
|
||||
# @@protoc_insertion_point(class_scope:protobuf_unittest.TestBadIdentifiers)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestBadIdentifiers)
|
||||
|
||||
AnotherMessage = _reflection.GeneratedProtocolMessageType('AnotherMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _ANOTHERMESSAGE,
|
||||
__module__ = 'google.protobuf.internal.test_bad_identifiers_pb2'
|
||||
AnotherMessage = _reflection.GeneratedProtocolMessageType('AnotherMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _ANOTHERMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.test_bad_identifiers_pb2'
|
||||
# @@protoc_insertion_point(class_scope:protobuf_unittest.AnotherMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(AnotherMessage)
|
||||
|
||||
TestBadIdentifiers.RegisterExtension(message)
|
||||
TestBadIdentifiers.RegisterExtension(descriptor)
|
||||
TestBadIdentifiers.RegisterExtension(reflection)
|
||||
TestBadIdentifiers.RegisterExtension(service)
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
|
||||
_ANOTHERSERVICE = _descriptor.ServiceDescriptor(
|
||||
name='AnotherService',
|
||||
full_name='protobuf_unittest.AnotherService',
|
||||
file=DESCRIPTOR,
|
||||
index=0,
|
||||
serialized_options=None,
|
||||
serialized_start=124,
|
||||
serialized_end=140,
|
||||
methods=[
|
||||
])
|
||||
_sym_db.RegisterServiceDescriptor(_ANOTHERSERVICE)
|
||||
|
||||
DESCRIPTOR.services_by_name['AnotherService'] = _ANOTHERSERVICE
|
||||
_ANOTHERSERVICE = DESCRIPTOR.services_by_name['AnotherService']
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
TestBadIdentifiers.RegisterExtension(message)
|
||||
TestBadIdentifiers.RegisterExtension(descriptor)
|
||||
TestBadIdentifiers.RegisterExtension(reflection)
|
||||
TestBadIdentifiers.RegisterExtension(service)
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'\220\001\001'
|
||||
_TESTBADIDENTIFIERS._serialized_start=74
|
||||
_TESTBADIDENTIFIERS._serialized_end=104
|
||||
_ANOTHERMESSAGE._serialized_start=106
|
||||
_ANOTHERMESSAGE._serialized_end=122
|
||||
_ANOTHERSERVICE._serialized_start=124
|
||||
_ANOTHERSERVICE._serialized_end=140
|
||||
AnotherService = service_reflection.GeneratedServiceType('AnotherService', (_service.Service,), dict(
|
||||
DESCRIPTOR = _ANOTHERSERVICE,
|
||||
__module__ = 'google.protobuf.internal.test_bad_identifiers_pb2'
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
// 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.
|
||||
|
||||
syntax = "proto3";
|
||||
|
||||
package google.protobuf.python.internal;
|
||||
|
||||
message TestProto3Optional {
|
||||
message NestedMessage {
|
||||
// The field name "b" fails to compile in proto1 because it conflicts with
|
||||
// a local variable named "b" in one of the generated methods. Doh.
|
||||
// This file needs to compile in proto1 to test backwards-compatibility.
|
||||
optional int32 bb = 1;
|
||||
}
|
||||
|
||||
enum NestedEnum {
|
||||
UNSPECIFIED = 0;
|
||||
FOO = 1;
|
||||
BAR = 2;
|
||||
BAZ = 3;
|
||||
NEG = -1; // Intentionally negative.
|
||||
}
|
||||
|
||||
// Singular
|
||||
optional int32 optional_int32 = 1;
|
||||
optional int64 optional_int64 = 2;
|
||||
optional uint32 optional_uint32 = 3;
|
||||
optional uint64 optional_uint64 = 4;
|
||||
optional sint32 optional_sint32 = 5;
|
||||
optional sint64 optional_sint64 = 6;
|
||||
optional fixed32 optional_fixed32 = 7;
|
||||
optional fixed64 optional_fixed64 = 8;
|
||||
optional sfixed32 optional_sfixed32 = 9;
|
||||
optional sfixed64 optional_sfixed64 = 10;
|
||||
optional float optional_float = 11;
|
||||
optional double optional_double = 12;
|
||||
optional bool optional_bool = 13;
|
||||
optional string optional_string = 14;
|
||||
optional bytes optional_bytes = 15;
|
||||
|
||||
optional NestedMessage optional_nested_message = 18;
|
||||
optional NestedEnum optional_nested_enum = 21;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/internal/test_proto3_optional.proto
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
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_pool.Default().AddSerializedFile(b'\n3google/protobuf/internal/test_proto3_optional.proto\x12\x1fgoogle.protobuf.python.internal\"\xf8\x08\n\x12TestProto3Optional\x12\x1b\n\x0eoptional_int32\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x1b\n\x0eoptional_int64\x18\x02 \x01(\x03H\x01\x88\x01\x01\x12\x1c\n\x0foptional_uint32\x18\x03 \x01(\rH\x02\x88\x01\x01\x12\x1c\n\x0foptional_uint64\x18\x04 \x01(\x04H\x03\x88\x01\x01\x12\x1c\n\x0foptional_sint32\x18\x05 \x01(\x11H\x04\x88\x01\x01\x12\x1c\n\x0foptional_sint64\x18\x06 \x01(\x12H\x05\x88\x01\x01\x12\x1d\n\x10optional_fixed32\x18\x07 \x01(\x07H\x06\x88\x01\x01\x12\x1d\n\x10optional_fixed64\x18\x08 \x01(\x06H\x07\x88\x01\x01\x12\x1e\n\x11optional_sfixed32\x18\t \x01(\x0fH\x08\x88\x01\x01\x12\x1e\n\x11optional_sfixed64\x18\n \x01(\x10H\t\x88\x01\x01\x12\x1b\n\x0eoptional_float\x18\x0b \x01(\x02H\n\x88\x01\x01\x12\x1c\n\x0foptional_double\x18\x0c \x01(\x01H\x0b\x88\x01\x01\x12\x1a\n\roptional_bool\x18\r \x01(\x08H\x0c\x88\x01\x01\x12\x1c\n\x0foptional_string\x18\x0e \x01(\tH\r\x88\x01\x01\x12\x1b\n\x0eoptional_bytes\x18\x0f \x01(\x0cH\x0e\x88\x01\x01\x12g\n\x17optional_nested_message\x18\x12 \x01(\x0b\x32\x41.google.protobuf.python.internal.TestProto3Optional.NestedMessageH\x0f\x88\x01\x01\x12\x61\n\x14optional_nested_enum\x18\x15 \x01(\x0e\x32>.google.protobuf.python.internal.TestProto3Optional.NestedEnumH\x10\x88\x01\x01\x1a\'\n\rNestedMessage\x12\x0f\n\x02\x62\x62\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\x05\n\x03_bb\"J\n\nNestedEnum\x12\x0f\n\x0bUNSPECIFIED\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\x11\n\x0f_optional_int32B\x11\n\x0f_optional_int64B\x12\n\x10_optional_uint32B\x12\n\x10_optional_uint64B\x12\n\x10_optional_sint32B\x12\n\x10_optional_sint64B\x13\n\x11_optional_fixed32B\x13\n\x11_optional_fixed64B\x14\n\x12_optional_sfixed32B\x14\n\x12_optional_sfixed64B\x11\n\x0f_optional_floatB\x12\n\x10_optional_doubleB\x10\n\x0e_optional_boolB\x12\n\x10_optional_stringB\x11\n\x0f_optional_bytesB\x1a\n\x18_optional_nested_messageB\x17\n\x15_optional_nested_enumb\x06proto3')
|
||||
|
||||
|
||||
|
||||
_TESTPROTO3OPTIONAL = DESCRIPTOR.message_types_by_name['TestProto3Optional']
|
||||
_TESTPROTO3OPTIONAL_NESTEDMESSAGE = _TESTPROTO3OPTIONAL.nested_types_by_name['NestedMessage']
|
||||
_TESTPROTO3OPTIONAL_NESTEDENUM = _TESTPROTO3OPTIONAL.enum_types_by_name['NestedEnum']
|
||||
TestProto3Optional = _reflection.GeneratedProtocolMessageType('TestProto3Optional', (_message.Message,), {
|
||||
|
||||
'NestedMessage' : _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTPROTO3OPTIONAL_NESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.internal.test_proto3_optional_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestProto3Optional.NestedMessage)
|
||||
})
|
||||
,
|
||||
'DESCRIPTOR' : _TESTPROTO3OPTIONAL,
|
||||
'__module__' : 'google.protobuf.internal.test_proto3_optional_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestProto3Optional)
|
||||
})
|
||||
_sym_db.RegisterMessage(TestProto3Optional)
|
||||
_sym_db.RegisterMessage(TestProto3Optional.NestedMessage)
|
||||
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_TESTPROTO3OPTIONAL._serialized_start=89
|
||||
_TESTPROTO3OPTIONAL._serialized_end=1233
|
||||
_TESTPROTO3OPTIONAL_NESTEDMESSAGE._serialized_start=765
|
||||
_TESTPROTO3OPTIONAL_NESTEDMESSAGE._serialized_end=804
|
||||
_TESTPROTO3OPTIONAL_NESTEDENUM._serialized_start=806
|
||||
_TESTPROTO3OPTIONAL_NESTEDENUM._serialized_end=880
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Executable → Regular
File mode changed.
@@ -38,18 +38,10 @@ If sys.gettotalrefcount() is not available (because Python was built without
|
||||
the Py_DEBUG option), then this module is a no-op and tests will run normally.
|
||||
"""
|
||||
|
||||
import copyreg
|
||||
import gc
|
||||
import sys
|
||||
|
||||
try:
|
||||
import copy_reg as copyreg #PY26
|
||||
except ImportError:
|
||||
import copyreg
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
|
||||
class LocalTestResult(unittest.TestResult):
|
||||
@@ -69,8 +61,8 @@ class LocalTestResult(unittest.TestResult):
|
||||
pass
|
||||
|
||||
|
||||
class ReferenceLeakCheckerTestCase(unittest.TestCase):
|
||||
"""A TestCase which runs tests multiple times, collecting reference counts."""
|
||||
class ReferenceLeakCheckerMixin(object):
|
||||
"""A mixin class for TestCase, which checks reference counts."""
|
||||
|
||||
NB_RUNS = 3
|
||||
|
||||
@@ -81,8 +73,8 @@ class ReferenceLeakCheckerTestCase(unittest.TestCase):
|
||||
self._saved_pickle_registry = copyreg.dispatch_table.copy()
|
||||
|
||||
# Run the test twice, to warm up the instance attributes.
|
||||
super(ReferenceLeakCheckerTestCase, self).run(result=result)
|
||||
super(ReferenceLeakCheckerTestCase, self).run(result=result)
|
||||
super(ReferenceLeakCheckerMixin, self).run(result=result)
|
||||
super(ReferenceLeakCheckerMixin, self).run(result=result)
|
||||
|
||||
oldrefcount = 0
|
||||
local_result = LocalTestResult(result)
|
||||
@@ -90,7 +82,7 @@ class ReferenceLeakCheckerTestCase(unittest.TestCase):
|
||||
refcount_deltas = []
|
||||
for _ in range(self.NB_RUNS):
|
||||
oldrefcount = self._getRefcounts()
|
||||
super(ReferenceLeakCheckerTestCase, self).run(result=local_result)
|
||||
super(ReferenceLeakCheckerMixin, self).run(result=local_result)
|
||||
newrefcount = self._getRefcounts()
|
||||
refcount_deltas.append(newrefcount - oldrefcount)
|
||||
print(refcount_deltas, self)
|
||||
@@ -112,12 +104,19 @@ class ReferenceLeakCheckerTestCase(unittest.TestCase):
|
||||
|
||||
|
||||
if hasattr(sys, 'gettotalrefcount'):
|
||||
BaseTestCase = ReferenceLeakCheckerTestCase
|
||||
|
||||
def TestCase(test_class):
|
||||
new_bases = (ReferenceLeakCheckerMixin,) + test_class.__bases__
|
||||
new_class = type(test_class)(
|
||||
test_class.__name__, new_bases, dict(test_class.__dict__))
|
||||
return new_class
|
||||
SkipReferenceLeakChecker = unittest.skip
|
||||
|
||||
else:
|
||||
# When PyDEBUG is not enabled, run the tests normally.
|
||||
BaseTestCase = unittest.TestCase
|
||||
|
||||
def TestCase(test_class):
|
||||
return test_class
|
||||
|
||||
def SkipReferenceLeakChecker(reason):
|
||||
del reason # Don't skip, so don't need a reason.
|
||||
|
||||
Executable → Regular
+1
-6
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -32,10 +30,7 @@
|
||||
|
||||
"""Tests for google.protobuf.text_encoding."""
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
from google.protobuf import text_encoding
|
||||
|
||||
|
||||
Executable → Regular
+920
-148
File diff suppressed because it is too large.
Load diff
Executable → Regular
+78
-21
@@ -38,18 +38,15 @@ TYPE_TO_BYTE_SIZE_FN: A dictionary with field types and a size computing
|
||||
TYPE_TO_SERIALIZE_METHOD: A dictionary with field types and serialization
|
||||
function.
|
||||
FIELD_TYPE_TO_WIRE_TYPE: A dictionary with field typed and their
|
||||
coresponding wire types.
|
||||
corresponding wire types.
|
||||
TYPE_TO_DESERIALIZE_METHOD: A dictionary with field types and deserialization
|
||||
function.
|
||||
"""
|
||||
|
||||
__author__ = 'robinson@google.com (Will Robinson)'
|
||||
|
||||
import ctypes
|
||||
import numbers
|
||||
import six
|
||||
|
||||
if six.PY3:
|
||||
long = int
|
||||
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import decoder
|
||||
@@ -59,6 +56,26 @@ from google.protobuf import descriptor
|
||||
|
||||
_FieldDescriptor = descriptor.FieldDescriptor
|
||||
|
||||
|
||||
def TruncateToFourByteFloat(original):
|
||||
return ctypes.c_float(original).value
|
||||
|
||||
|
||||
def ToShortestFloat(original):
|
||||
"""Returns the shortest float that has same value in wire."""
|
||||
# All 4 byte floats have between 6 and 9 significant digits, so we
|
||||
# start with 6 as the lower bound.
|
||||
# It has to be iterative because use '.9g' directly can not get rid
|
||||
# of the noises for most values. For example if set a float_field=0.9
|
||||
# use '.9g' will print 0.899999976.
|
||||
precision = 6
|
||||
rounded = float('{0:.{1}g}'.format(original, precision))
|
||||
while TruncateToFourByteFloat(rounded) != original:
|
||||
precision += 1
|
||||
rounded = float('{0:.{1}g}'.format(original, precision))
|
||||
return rounded
|
||||
|
||||
|
||||
def SupportsOpenEnums(field_descriptor):
|
||||
return field_descriptor.containing_type.syntax == "proto3"
|
||||
|
||||
@@ -107,13 +124,18 @@ class TypeChecker(object):
|
||||
message = ('%.1024r has type %s, but expected one of: %s' %
|
||||
(proposed_value, type(proposed_value), self._acceptable_types))
|
||||
raise TypeError(message)
|
||||
# Some field types(float, double and bool) accept other types, must
|
||||
# convert to the correct type in such cases.
|
||||
if self._acceptable_types:
|
||||
if self._acceptable_types[0] in (bool, float):
|
||||
return self._acceptable_types[0](proposed_value)
|
||||
return proposed_value
|
||||
|
||||
|
||||
class TypeCheckerWithDefault(TypeChecker):
|
||||
|
||||
def __init__(self, default_value, *acceptable_types):
|
||||
TypeChecker.__init__(self, acceptable_types)
|
||||
TypeChecker.__init__(self, *acceptable_types)
|
||||
self._default_value = default_value
|
||||
|
||||
def DefaultValue(self):
|
||||
@@ -129,14 +151,13 @@ class IntValueChecker(object):
|
||||
def CheckValue(self, proposed_value):
|
||||
if not isinstance(proposed_value, numbers.Integral):
|
||||
message = ('%.1024r has type %s, but expected one of: %s' %
|
||||
(proposed_value, type(proposed_value), six.integer_types))
|
||||
(proposed_value, type(proposed_value), (int,)))
|
||||
raise TypeError(message)
|
||||
if not self._MIN <= int(proposed_value) <= self._MAX:
|
||||
raise ValueError('Value out of range: %d' % proposed_value)
|
||||
# We force 32-bit values to int and 64-bit values to long to make
|
||||
# alternate implementations where the distinction is more significant
|
||||
# (e.g. the C++ implementation) simpler.
|
||||
proposed_value = self._TYPE(proposed_value)
|
||||
# We force all values to int to make alternate implementations where the
|
||||
# distinction is more significant (e.g. the C++ implementation) simpler.
|
||||
proposed_value = int(proposed_value)
|
||||
return proposed_value
|
||||
|
||||
def DefaultValue(self):
|
||||
@@ -153,7 +174,7 @@ class EnumValueChecker(object):
|
||||
def CheckValue(self, proposed_value):
|
||||
if not isinstance(proposed_value, numbers.Integral):
|
||||
message = ('%.1024r has type %s, but expected one of: %s' %
|
||||
(proposed_value, type(proposed_value), six.integer_types))
|
||||
(proposed_value, type(proposed_value), (int,)))
|
||||
raise TypeError(message)
|
||||
if int(proposed_value) not in self._enum_type.values_by_number:
|
||||
raise ValueError('Unknown enum value: %d' % proposed_value)
|
||||
@@ -171,9 +192,9 @@ class UnicodeValueChecker(object):
|
||||
"""
|
||||
|
||||
def CheckValue(self, proposed_value):
|
||||
if not isinstance(proposed_value, (bytes, six.text_type)):
|
||||
if not isinstance(proposed_value, (bytes, str)):
|
||||
message = ('%.1024r has type %s, but expected one of: %s' %
|
||||
(proposed_value, type(proposed_value), (bytes, six.text_type)))
|
||||
(proposed_value, type(proposed_value), (bytes, str)))
|
||||
raise TypeError(message)
|
||||
|
||||
# If the value is of type 'bytes' make sure that it is valid UTF-8 data.
|
||||
@@ -185,6 +206,14 @@ class UnicodeValueChecker(object):
|
||||
'encoding. Non-UTF-8 strings must be converted to '
|
||||
'unicode objects before being added.' %
|
||||
(proposed_value))
|
||||
else:
|
||||
try:
|
||||
proposed_value.encode('utf8')
|
||||
except UnicodeEncodeError:
|
||||
raise ValueError('%.1024r isn\'t a valid unicode string and '
|
||||
'can\'t be encoded in UTF-8.'%
|
||||
(proposed_value))
|
||||
|
||||
return proposed_value
|
||||
|
||||
def DefaultValue(self):
|
||||
@@ -196,25 +225,54 @@ class Int32ValueChecker(IntValueChecker):
|
||||
# efficient.
|
||||
_MIN = -2147483648
|
||||
_MAX = 2147483647
|
||||
_TYPE = int
|
||||
|
||||
|
||||
class Uint32ValueChecker(IntValueChecker):
|
||||
_MIN = 0
|
||||
_MAX = (1 << 32) - 1
|
||||
_TYPE = int
|
||||
|
||||
|
||||
class Int64ValueChecker(IntValueChecker):
|
||||
_MIN = -(1 << 63)
|
||||
_MAX = (1 << 63) - 1
|
||||
_TYPE = long
|
||||
|
||||
|
||||
class Uint64ValueChecker(IntValueChecker):
|
||||
_MIN = 0
|
||||
_MAX = (1 << 64) - 1
|
||||
_TYPE = long
|
||||
|
||||
|
||||
# The max 4 bytes float is about 3.4028234663852886e+38
|
||||
_FLOAT_MAX = float.fromhex('0x1.fffffep+127')
|
||||
_FLOAT_MIN = -_FLOAT_MAX
|
||||
_INF = float('inf')
|
||||
_NEG_INF = float('-inf')
|
||||
|
||||
|
||||
class FloatValueChecker(object):
|
||||
|
||||
"""Checker used for float fields. Performs type-check and range check.
|
||||
|
||||
Values exceeding a 32-bit float will be converted to inf/-inf.
|
||||
"""
|
||||
|
||||
def CheckValue(self, proposed_value):
|
||||
"""Check and convert proposed_value to float."""
|
||||
if not isinstance(proposed_value, numbers.Real):
|
||||
message = ('%.1024r has type %s, but expected one of: numbers.Real' %
|
||||
(proposed_value, type(proposed_value)))
|
||||
raise TypeError(message)
|
||||
converted_value = float(proposed_value)
|
||||
# This inf rounding matches the C++ proto SafeDoubleToFloat logic.
|
||||
if converted_value > _FLOAT_MAX:
|
||||
return _INF
|
||||
if converted_value < _FLOAT_MIN:
|
||||
return _NEG_INF
|
||||
|
||||
return TruncateToFourByteFloat(converted_value)
|
||||
|
||||
def DefaultValue(self):
|
||||
return 0.0
|
||||
|
||||
|
||||
# Type-checkers for all scalar CPPTYPEs.
|
||||
@@ -224,9 +282,8 @@ _VALUE_CHECKERS = {
|
||||
_FieldDescriptor.CPPTYPE_UINT32: Uint32ValueChecker(),
|
||||
_FieldDescriptor.CPPTYPE_UINT64: Uint64ValueChecker(),
|
||||
_FieldDescriptor.CPPTYPE_DOUBLE: TypeCheckerWithDefault(
|
||||
0.0, numbers.Real),
|
||||
_FieldDescriptor.CPPTYPE_FLOAT: TypeCheckerWithDefault(
|
||||
0.0, numbers.Real),
|
||||
0.0, float, numbers.Real),
|
||||
_FieldDescriptor.CPPTYPE_FLOAT: FloatValueChecker(),
|
||||
_FieldDescriptor.CPPTYPE_BOOL: TypeCheckerWithDefault(
|
||||
False, bool, numbers.Integral),
|
||||
_FieldDescriptor.CPPTYPE_STRING: TypeCheckerWithDefault(b'', bytes),
|
||||
|
||||
Executable → Regular
+197
-56
@@ -1,6 +1,4 @@
|
||||
#! /usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -35,10 +33,10 @@
|
||||
|
||||
__author__ = 'bohdank@google.com (Bohdan Koval)'
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
from google.protobuf import map_unittest_pb2
|
||||
from google.protobuf import unittest_mset_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf import unittest_proto3_arena_pb2
|
||||
@@ -49,21 +47,18 @@ from google.protobuf.internal import missing_enum_values_pb2
|
||||
from google.protobuf.internal import test_util
|
||||
from google.protobuf.internal import testing_refleaks
|
||||
from google.protobuf.internal import type_checkers
|
||||
from google.protobuf.internal import wire_format
|
||||
from google.protobuf import descriptor
|
||||
|
||||
try:
|
||||
import tracemalloc # pylint: disable=g-import-not-at-top
|
||||
except ImportError:
|
||||
# Requires python 3.4+
|
||||
pass
|
||||
|
||||
|
||||
BaseTestCase = testing_refleaks.BaseTestCase
|
||||
|
||||
|
||||
# CheckUnknownField() cannot be used by the C++ implementation because
|
||||
# some protect members are called. It is not a behavior difference
|
||||
# for python and C++ implementation.
|
||||
def SkipCheckUnknownFieldIfCppImplementation(func):
|
||||
return unittest.skipIf(
|
||||
api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
|
||||
'Addtional test for pure python involved protect members')(func)
|
||||
|
||||
|
||||
class UnknownFieldsTest(BaseTestCase):
|
||||
@testing_refleaks.TestCase
|
||||
class UnknownFieldsTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
@@ -80,23 +75,11 @@ class UnknownFieldsTest(BaseTestCase):
|
||||
# stdout.
|
||||
self.assertTrue(data == self.all_fields_data)
|
||||
|
||||
def expectSerializeProto3(self, preserve):
|
||||
def testSerializeProto3(self):
|
||||
# Verify proto3 unknown fields behavior.
|
||||
message = unittest_proto3_arena_pb2.TestEmptyMessage()
|
||||
message.ParseFromString(self.all_fields_data)
|
||||
if preserve:
|
||||
self.assertEqual(self.all_fields_data, message.SerializeToString())
|
||||
else:
|
||||
self.assertEqual(0, len(message.SerializeToString()))
|
||||
|
||||
def testSerializeProto3(self):
|
||||
# Verify that proto3 unknown fields behavior.
|
||||
default_preserve = (api_implementation
|
||||
.GetPythonProto3PreserveUnknownsDefault())
|
||||
self.expectSerializeProto3(default_preserve)
|
||||
api_implementation.SetPythonProto3PreserveUnknownsDefault(
|
||||
not default_preserve)
|
||||
self.expectSerializeProto3(not default_preserve)
|
||||
api_implementation.SetPythonProto3PreserveUnknownsDefault(default_preserve)
|
||||
self.assertEqual(self.all_fields_data, message.SerializeToString())
|
||||
|
||||
def testByteSize(self):
|
||||
self.assertEqual(self.all_fields.ByteSize(), self.empty_message.ByteSize())
|
||||
@@ -112,7 +95,7 @@ class UnknownFieldsTest(BaseTestCase):
|
||||
|
||||
# Add an unknown extension.
|
||||
item = raw.item.add()
|
||||
item.type_id = 98418603
|
||||
item.type_id = 98218603
|
||||
message1 = message_set_extensions_pb2.TestMessageSetExtension1()
|
||||
message1.i = 12345
|
||||
item.message = message1.SerializeToString()
|
||||
@@ -123,6 +106,18 @@ class UnknownFieldsTest(BaseTestCase):
|
||||
proto = message_set_extensions_pb2.TestMessageSet()
|
||||
proto.MergeFromString(serialized)
|
||||
|
||||
unknown_fields = proto.UnknownFields()
|
||||
self.assertEqual(len(unknown_fields), 1)
|
||||
# Unknown field should have wire format data which can be parsed back to
|
||||
# original message.
|
||||
self.assertEqual(unknown_fields[0].field_number, item.type_id)
|
||||
self.assertEqual(unknown_fields[0].wire_type,
|
||||
wire_format.WIRETYPE_LENGTH_DELIMITED)
|
||||
d = unknown_fields[0].data
|
||||
message_new = message_set_extensions_pb2.TestMessageSetExtension1()
|
||||
message_new.ParseFromString(d)
|
||||
self.assertEqual(message1, message_new)
|
||||
|
||||
# Verify that the unknown extension is serialized unchanged
|
||||
reserialized = proto.SerializeToString()
|
||||
new_raw = unittest_mset_pb2.RawMessageSet()
|
||||
@@ -158,8 +153,21 @@ class UnknownFieldsTest(BaseTestCase):
|
||||
self.assertEqual(
|
||||
b'', message.repeated_nested_message[0].SerializeToString())
|
||||
|
||||
msg = map_unittest_pb2.TestMap()
|
||||
msg.map_int32_all_types[1].optional_nested_message.ParseFromString(
|
||||
other_message.SerializeToString())
|
||||
msg.map_string_string['1'] = 'test'
|
||||
self.assertNotEqual(
|
||||
b'',
|
||||
msg.map_int32_all_types[1].optional_nested_message.SerializeToString())
|
||||
msg.DiscardUnknownFields()
|
||||
self.assertEqual(
|
||||
b'',
|
||||
msg.map_int32_all_types[1].optional_nested_message.SerializeToString())
|
||||
|
||||
class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
|
||||
@testing_refleaks.TestCase
|
||||
class UnknownFieldsAccessorsTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
|
||||
@@ -169,13 +177,15 @@ class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
self.empty_message = unittest_pb2.TestEmptyMessage()
|
||||
self.empty_message.ParseFromString(self.all_fields_data)
|
||||
|
||||
# CheckUnknownField() is an additional Pure Python check which checks
|
||||
# InternalCheckUnknownField() is an additional Pure Python check which checks
|
||||
# a detail of unknown fields. It cannot be used by the C++
|
||||
# implementation because some protect members are called.
|
||||
# The test is added for historical reasons. It is not necessary as
|
||||
# serialized string is checked.
|
||||
|
||||
def CheckUnknownField(self, name, expected_value):
|
||||
# TODO(jieluo): Remove message._unknown_fields.
|
||||
def InternalCheckUnknownField(self, name, expected_value):
|
||||
if api_implementation.Type() == 'cpp':
|
||||
return
|
||||
field_descriptor = self.descriptor.fields_by_name[name]
|
||||
wire_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[field_descriptor.type]
|
||||
field_tag = encoder.TagBytes(field_descriptor.number, wire_type)
|
||||
@@ -183,36 +193,82 @@ class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
for tag_bytes, value in self.empty_message._unknown_fields:
|
||||
if tag_bytes == field_tag:
|
||||
decoder = unittest_pb2.TestAllTypes._decoders_by_tag[tag_bytes][0]
|
||||
decoder(value, 0, len(value), self.all_fields, result_dict)
|
||||
decoder(memoryview(value), 0, len(value), self.all_fields, result_dict)
|
||||
self.assertEqual(expected_value, result_dict[field_descriptor])
|
||||
|
||||
@SkipCheckUnknownFieldIfCppImplementation
|
||||
def CheckUnknownField(self, name, unknown_fields, expected_value):
|
||||
field_descriptor = self.descriptor.fields_by_name[name]
|
||||
expected_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[
|
||||
field_descriptor.type]
|
||||
for unknown_field in unknown_fields:
|
||||
if unknown_field.field_number == field_descriptor.number:
|
||||
self.assertEqual(expected_type, unknown_field.wire_type)
|
||||
if expected_type == 3:
|
||||
# Check group
|
||||
self.assertEqual(expected_value[0],
|
||||
unknown_field.data[0].field_number)
|
||||
self.assertEqual(expected_value[1], unknown_field.data[0].wire_type)
|
||||
self.assertEqual(expected_value[2], unknown_field.data[0].data)
|
||||
continue
|
||||
if expected_type == wire_format.WIRETYPE_LENGTH_DELIMITED:
|
||||
self.assertIn(type(unknown_field.data), (str, bytes))
|
||||
if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
self.assertIn(unknown_field.data, expected_value)
|
||||
else:
|
||||
self.assertEqual(expected_value, unknown_field.data)
|
||||
|
||||
def testCheckUnknownFieldValue(self):
|
||||
unknown_fields = self.empty_message.UnknownFields()
|
||||
# Test enum.
|
||||
self.CheckUnknownField('optional_nested_enum',
|
||||
unknown_fields,
|
||||
self.all_fields.optional_nested_enum)
|
||||
self.InternalCheckUnknownField('optional_nested_enum',
|
||||
self.all_fields.optional_nested_enum)
|
||||
|
||||
# Test repeated enum.
|
||||
self.CheckUnknownField('repeated_nested_enum',
|
||||
unknown_fields,
|
||||
self.all_fields.repeated_nested_enum)
|
||||
self.InternalCheckUnknownField('repeated_nested_enum',
|
||||
self.all_fields.repeated_nested_enum)
|
||||
|
||||
# Test varint.
|
||||
self.CheckUnknownField('optional_int32',
|
||||
unknown_fields,
|
||||
self.all_fields.optional_int32)
|
||||
self.InternalCheckUnknownField('optional_int32',
|
||||
self.all_fields.optional_int32)
|
||||
|
||||
# Test fixed32.
|
||||
self.CheckUnknownField('optional_fixed32',
|
||||
unknown_fields,
|
||||
self.all_fields.optional_fixed32)
|
||||
self.InternalCheckUnknownField('optional_fixed32',
|
||||
self.all_fields.optional_fixed32)
|
||||
|
||||
# Test fixed64.
|
||||
self.CheckUnknownField('optional_fixed64',
|
||||
unknown_fields,
|
||||
self.all_fields.optional_fixed64)
|
||||
self.InternalCheckUnknownField('optional_fixed64',
|
||||
self.all_fields.optional_fixed64)
|
||||
|
||||
# Test lengthd elimited.
|
||||
# Test length delimited.
|
||||
self.CheckUnknownField('optional_string',
|
||||
self.all_fields.optional_string)
|
||||
unknown_fields,
|
||||
self.all_fields.optional_string.encode('utf-8'))
|
||||
self.InternalCheckUnknownField('optional_string',
|
||||
self.all_fields.optional_string)
|
||||
|
||||
# Test group.
|
||||
self.CheckUnknownField('optionalgroup',
|
||||
self.all_fields.optionalgroup)
|
||||
unknown_fields,
|
||||
(17, 0, 117))
|
||||
self.InternalCheckUnknownField('optionalgroup',
|
||||
self.all_fields.optionalgroup)
|
||||
|
||||
self.assertEqual(97, len(unknown_fields))
|
||||
|
||||
def testCopyFrom(self):
|
||||
message = unittest_pb2.TestEmptyMessage()
|
||||
@@ -230,9 +286,18 @@ class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
message.optional_int64 = 3
|
||||
message.optional_uint32 = 4
|
||||
destination = unittest_pb2.TestEmptyMessage()
|
||||
unknown_fields = destination.UnknownFields()
|
||||
self.assertEqual(0, len(unknown_fields))
|
||||
destination.ParseFromString(message.SerializeToString())
|
||||
|
||||
# ParseFromString clears the message thus unknown fields is invalid.
|
||||
with self.assertRaises(ValueError) as context:
|
||||
len(unknown_fields)
|
||||
self.assertIn('UnknownFields does not exist.',
|
||||
str(context.exception))
|
||||
unknown_fields = destination.UnknownFields()
|
||||
self.assertEqual(2, len(unknown_fields))
|
||||
destination.MergeFrom(source)
|
||||
self.assertEqual(4, len(unknown_fields))
|
||||
# Check that the fields where correctly merged, even stored in the unknown
|
||||
# fields set.
|
||||
message.ParseFromString(destination.SerializeToString())
|
||||
@@ -241,17 +306,88 @@ class UnknownFieldsAccessorsTest(BaseTestCase):
|
||||
self.assertEqual(message.optional_int64, 3)
|
||||
|
||||
def testClear(self):
|
||||
unknown_fields = self.empty_message.UnknownFields()
|
||||
self.empty_message.Clear()
|
||||
# All cleared, even unknown fields.
|
||||
self.assertEqual(self.empty_message.SerializeToString(), b'')
|
||||
with self.assertRaises(ValueError) as context:
|
||||
len(unknown_fields)
|
||||
self.assertIn('UnknownFields does not exist.',
|
||||
str(context.exception))
|
||||
|
||||
@unittest.skipIf((sys.version_info.major, sys.version_info.minor) < (3, 4),
|
||||
'tracemalloc requires python 3.4+')
|
||||
def testUnknownFieldsNoMemoryLeak(self):
|
||||
# Call to UnknownFields must not leak memory
|
||||
nb_leaks = 1234
|
||||
|
||||
def leaking_function():
|
||||
for _ in range(nb_leaks):
|
||||
self.empty_message.UnknownFields()
|
||||
|
||||
tracemalloc.start()
|
||||
snapshot1 = tracemalloc.take_snapshot()
|
||||
leaking_function()
|
||||
snapshot2 = tracemalloc.take_snapshot()
|
||||
top_stats = snapshot2.compare_to(snapshot1, 'lineno')
|
||||
tracemalloc.stop()
|
||||
# There's no easy way to look for a precise leak source.
|
||||
# Rely on a "marker" count value while checking allocated memory.
|
||||
self.assertEqual([], [x for x in top_stats if x.count_diff == nb_leaks])
|
||||
|
||||
def testSubUnknownFields(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
message.optionalgroup.a = 123
|
||||
destination = unittest_pb2.TestEmptyMessage()
|
||||
destination.ParseFromString(message.SerializeToString())
|
||||
sub_unknown_fields = destination.UnknownFields()[0].data
|
||||
self.assertEqual(1, len(sub_unknown_fields))
|
||||
self.assertEqual(sub_unknown_fields[0].data, 123)
|
||||
destination.Clear()
|
||||
with self.assertRaises(ValueError) as context:
|
||||
len(sub_unknown_fields)
|
||||
self.assertIn('UnknownFields does not exist.',
|
||||
str(context.exception))
|
||||
with self.assertRaises(ValueError) as context:
|
||||
# pylint: disable=pointless-statement
|
||||
sub_unknown_fields[0]
|
||||
self.assertIn('UnknownFields does not exist.',
|
||||
str(context.exception))
|
||||
message.Clear()
|
||||
message.optional_uint32 = 456
|
||||
nested_message = unittest_pb2.NestedTestAllTypes()
|
||||
nested_message.payload.optional_nested_message.ParseFromString(
|
||||
message.SerializeToString())
|
||||
unknown_fields = (
|
||||
nested_message.payload.optional_nested_message.UnknownFields())
|
||||
self.assertEqual(unknown_fields[0].data, 456)
|
||||
nested_message.ClearField('payload')
|
||||
self.assertEqual(unknown_fields[0].data, 456)
|
||||
unknown_fields = (
|
||||
nested_message.payload.optional_nested_message.UnknownFields())
|
||||
self.assertEqual(0, len(unknown_fields))
|
||||
|
||||
def testUnknownField(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
message.optional_int32 = 123
|
||||
destination = unittest_pb2.TestEmptyMessage()
|
||||
destination.ParseFromString(message.SerializeToString())
|
||||
unknown_field = destination.UnknownFields()[0]
|
||||
destination.Clear()
|
||||
with self.assertRaises(ValueError) as context:
|
||||
unknown_field.data # pylint: disable=pointless-statement
|
||||
self.assertIn('The parent message might be cleared.',
|
||||
str(context.exception))
|
||||
|
||||
def testUnknownExtensions(self):
|
||||
message = unittest_pb2.TestEmptyMessageWithExtensions()
|
||||
message.ParseFromString(self.all_fields_data)
|
||||
self.assertEqual(len(message.UnknownFields()), 97)
|
||||
self.assertEqual(message.SerializeToString(), self.all_fields_data)
|
||||
|
||||
|
||||
class UnknownEnumValuesTest(BaseTestCase):
|
||||
@testing_refleaks.TestCase
|
||||
class UnknownEnumValuesTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.descriptor = missing_enum_values_pb2.TestEnumValues.DESCRIPTOR
|
||||
@@ -280,15 +416,19 @@ class UnknownEnumValuesTest(BaseTestCase):
|
||||
|
||||
def CheckUnknownField(self, name, expected_value):
|
||||
field_descriptor = self.descriptor.fields_by_name[name]
|
||||
wire_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[field_descriptor.type]
|
||||
field_tag = encoder.TagBytes(field_descriptor.number, wire_type)
|
||||
result_dict = {}
|
||||
for tag_bytes, value in self.missing_message._unknown_fields:
|
||||
if tag_bytes == field_tag:
|
||||
decoder = missing_enum_values_pb2.TestEnumValues._decoders_by_tag[
|
||||
tag_bytes][0]
|
||||
decoder(value, 0, len(value), self.message, result_dict)
|
||||
self.assertEqual(expected_value, result_dict[field_descriptor])
|
||||
unknown_fields = self.missing_message.UnknownFields()
|
||||
count = 0
|
||||
for field in unknown_fields:
|
||||
if field.field_number == field_descriptor.number:
|
||||
count += 1
|
||||
if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
self.assertIn(field.data, expected_value)
|
||||
else:
|
||||
self.assertEqual(expected_value, field.data)
|
||||
if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
|
||||
self.assertEqual(count, len(expected_value))
|
||||
else:
|
||||
self.assertEqual(count, 1)
|
||||
|
||||
def testUnknownParseMismatchEnumValue(self):
|
||||
just_string = missing_enum_values_pb2.JustString()
|
||||
@@ -317,8 +457,9 @@ class UnknownEnumValuesTest(BaseTestCase):
|
||||
def testUnknownPackedEnumValue(self):
|
||||
self.assertEqual([], self.missing_message.packed_nested_enum)
|
||||
|
||||
@SkipCheckUnknownFieldIfCppImplementation
|
||||
def testCheckUnknownFieldValueForEnum(self):
|
||||
unknown_fields = self.missing_message.UnknownFields()
|
||||
self.assertEqual(len(unknown_fields), 5)
|
||||
self.CheckUnknownField('optional_nested_enum',
|
||||
self.message.optional_nested_enum)
|
||||
self.CheckUnknownField('repeated_nested_enum',
|
||||
|
||||
@@ -40,10 +40,10 @@ This files defines well known classes which need extra maintenance including:
|
||||
|
||||
__author__ = 'jieluo@google.com (Jie Luo)'
|
||||
|
||||
import collections
|
||||
import calendar
|
||||
import collections.abc
|
||||
from datetime import datetime
|
||||
from datetime import timedelta
|
||||
import six
|
||||
|
||||
from google.protobuf.descriptor import FieldDescriptor
|
||||
|
||||
@@ -57,17 +57,11 @@ _SECONDS_PER_DAY = 24 * 3600
|
||||
_DURATION_SECONDS_MAX = 315576000000
|
||||
|
||||
|
||||
class Error(Exception):
|
||||
"""Top-level module error."""
|
||||
|
||||
|
||||
class ParseError(Error):
|
||||
"""Thrown in case of parsing error."""
|
||||
|
||||
|
||||
class Any(object):
|
||||
"""Class for Any Message type."""
|
||||
|
||||
__slots__ = ()
|
||||
|
||||
def Pack(self, msg, type_url_prefix='type.googleapis.com/',
|
||||
deterministic=None):
|
||||
"""Packs the specified message into current Any message."""
|
||||
@@ -92,12 +86,17 @@ class Any(object):
|
||||
|
||||
def Is(self, descriptor):
|
||||
"""Checks if this Any represents the given protobuf type."""
|
||||
return self.TypeName() == descriptor.full_name
|
||||
return '/' in self.type_url and self.TypeName() == descriptor.full_name
|
||||
|
||||
|
||||
_EPOCH_DATETIME = datetime.utcfromtimestamp(0)
|
||||
|
||||
|
||||
class Timestamp(object):
|
||||
"""Class for Timestamp message type."""
|
||||
|
||||
__slots__ = ()
|
||||
|
||||
def ToJsonString(self):
|
||||
"""Converts Timestamp to RFC 3339 date string format.
|
||||
|
||||
@@ -135,15 +134,17 @@ class Timestamp(object):
|
||||
Example of accepted format: '1972-01-01T10:00:20.021-05:00'
|
||||
|
||||
Raises:
|
||||
ParseError: On parsing problems.
|
||||
ValueError: On parsing problems.
|
||||
"""
|
||||
if not isinstance(value, str):
|
||||
raise ValueError('Timestamp JSON value not a string: {!r}'.format(value))
|
||||
timezone_offset = value.find('Z')
|
||||
if timezone_offset == -1:
|
||||
timezone_offset = value.find('+')
|
||||
if timezone_offset == -1:
|
||||
timezone_offset = value.rfind('-')
|
||||
if timezone_offset == -1:
|
||||
raise ParseError(
|
||||
raise ValueError(
|
||||
'Failed to parse timestamp: missing valid timezone offset.')
|
||||
time_value = value[0:timezone_offset]
|
||||
# Parse datetime and nanos.
|
||||
@@ -154,11 +155,15 @@ class Timestamp(object):
|
||||
else:
|
||||
second_value = time_value[:point_position]
|
||||
nano_value = time_value[point_position + 1:]
|
||||
if 't' in second_value:
|
||||
raise ValueError(
|
||||
'time data \'{0}\' does not match format \'%Y-%m-%dT%H:%M:%S\', '
|
||||
'lowercase \'t\' is not accepted'.format(second_value))
|
||||
date_object = datetime.strptime(second_value, _TIMESTAMPFOMAT)
|
||||
td = date_object - datetime(1970, 1, 1)
|
||||
seconds = td.seconds + td.days * _SECONDS_PER_DAY
|
||||
if len(nano_value) > 9:
|
||||
raise ParseError(
|
||||
raise ValueError(
|
||||
'Failed to parse Timestamp: nanos {0} more than '
|
||||
'9 fractional digits.'.format(nano_value))
|
||||
if nano_value:
|
||||
@@ -168,13 +173,13 @@ class Timestamp(object):
|
||||
# Parse timezone offsets.
|
||||
if value[timezone_offset] == 'Z':
|
||||
if len(value) != timezone_offset + 1:
|
||||
raise ParseError('Failed to parse timestamp: invalid trailing'
|
||||
raise ValueError('Failed to parse timestamp: invalid trailing'
|
||||
' data {0}.'.format(value))
|
||||
else:
|
||||
timezone = value[timezone_offset:]
|
||||
pos = timezone.find(':')
|
||||
if pos == -1:
|
||||
raise ParseError(
|
||||
raise ValueError(
|
||||
'Invalid timezone offset value: {0}.'.format(timezone))
|
||||
if timezone[0] == '+':
|
||||
seconds -= (int(timezone[1:pos])*60+int(timezone[pos+1:]))*60
|
||||
@@ -228,19 +233,28 @@ class Timestamp(object):
|
||||
|
||||
def ToDatetime(self):
|
||||
"""Converts Timestamp to datetime."""
|
||||
return datetime.utcfromtimestamp(
|
||||
self.seconds + self.nanos / float(_NANOS_PER_SECOND))
|
||||
return _EPOCH_DATETIME + timedelta(
|
||||
seconds=self.seconds, microseconds=_RoundTowardZero(
|
||||
self.nanos, _NANOS_PER_MICROSECOND))
|
||||
|
||||
def FromDatetime(self, dt):
|
||||
"""Converts datetime to Timestamp."""
|
||||
td = dt - datetime(1970, 1, 1)
|
||||
self.seconds = td.seconds + td.days * _SECONDS_PER_DAY
|
||||
self.nanos = td.microseconds * _NANOS_PER_MICROSECOND
|
||||
# Using this guide: http://wiki.python.org/moin/WorkingWithTime
|
||||
# And this conversion guide: http://docs.python.org/library/time.html
|
||||
|
||||
# Turn the date parameter into a tuple (struct_time) that can then be
|
||||
# manipulated into a long value of seconds. During the conversion from
|
||||
# struct_time to long, the source date in UTC, and so it follows that the
|
||||
# correct transformation is calendar.timegm()
|
||||
self.seconds = calendar.timegm(dt.utctimetuple())
|
||||
self.nanos = dt.microsecond * _NANOS_PER_MICROSECOND
|
||||
|
||||
|
||||
class Duration(object):
|
||||
"""Class for Duration message type."""
|
||||
|
||||
__slots__ = ()
|
||||
|
||||
def ToJsonString(self):
|
||||
"""Converts Duration to string format.
|
||||
|
||||
@@ -282,10 +296,12 @@ class Duration(object):
|
||||
precision. For example: "1s", "1.01s", "1.0000001s", "-3.100s
|
||||
|
||||
Raises:
|
||||
ParseError: On parsing problems.
|
||||
ValueError: On parsing problems.
|
||||
"""
|
||||
if not isinstance(value, str):
|
||||
raise ValueError('Duration JSON value not a string: {!r}'.format(value))
|
||||
if len(value) < 1 or value[-1] != 's':
|
||||
raise ParseError(
|
||||
raise ValueError(
|
||||
'Duration must end with letter "s": {0}.'.format(value))
|
||||
try:
|
||||
pos = value.find('.')
|
||||
@@ -301,9 +317,9 @@ class Duration(object):
|
||||
_CheckDurationValid(seconds, nanos)
|
||||
self.seconds = seconds
|
||||
self.nanos = nanos
|
||||
except ValueError:
|
||||
raise ParseError(
|
||||
'Couldn\'t parse duration: {0}.'.format(value))
|
||||
except ValueError as e:
|
||||
raise ValueError(
|
||||
'Couldn\'t parse duration: {0} : {1}.'.format(value, e))
|
||||
|
||||
def ToNanoseconds(self):
|
||||
"""Converts a Duration to nanoseconds."""
|
||||
@@ -368,21 +384,21 @@ class Duration(object):
|
||||
|
||||
def _CheckDurationValid(seconds, nanos):
|
||||
if seconds < -_DURATION_SECONDS_MAX or seconds > _DURATION_SECONDS_MAX:
|
||||
raise Error(
|
||||
raise ValueError(
|
||||
'Duration is not valid: Seconds {0} must be in range '
|
||||
'[-315576000000, 315576000000].'.format(seconds))
|
||||
if nanos <= -_NANOS_PER_SECOND or nanos >= _NANOS_PER_SECOND:
|
||||
raise Error(
|
||||
raise ValueError(
|
||||
'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(
|
||||
raise ValueError(
|
||||
'Duration is not valid: Sign mismatch.')
|
||||
|
||||
|
||||
def _RoundTowardZero(value, divider):
|
||||
"""Truncates the remainder part after division."""
|
||||
# For some languanges, the sign of the remainder is implementation
|
||||
# For some languages, the sign of the remainder is implementation
|
||||
# dependent if any of the operands is negative. Here we enforce
|
||||
# "rounded toward zero" semantics. For example, for (-5) / 2 an
|
||||
# implementation may give -3 as the result with the remainder being
|
||||
@@ -398,6 +414,8 @@ def _RoundTowardZero(value, divider):
|
||||
class FieldMask(object):
|
||||
"""Class for FieldMask message type."""
|
||||
|
||||
__slots__ = ()
|
||||
|
||||
def ToJsonString(self):
|
||||
"""Converts FieldMask to string according to proto3 JSON spec."""
|
||||
camelcase_paths = []
|
||||
@@ -407,9 +425,12 @@ class FieldMask(object):
|
||||
|
||||
def FromJsonString(self, value):
|
||||
"""Converts string to FieldMask according to proto3 JSON spec."""
|
||||
if not isinstance(value, str):
|
||||
raise ValueError('FieldMask JSON value not a string: {!r}'.format(value))
|
||||
self.Clear()
|
||||
for path in value.split(','):
|
||||
self.paths.append(_CamelCaseToSnakeCase(path))
|
||||
if value:
|
||||
for path in value.split(','):
|
||||
self.paths.append(_CamelCaseToSnakeCase(path))
|
||||
|
||||
def IsValidForDescriptor(self, message_descriptor):
|
||||
"""Checks whether the FieldMask is valid for Message Descriptor."""
|
||||
@@ -502,24 +523,26 @@ def _SnakeCaseToCamelCase(path_name):
|
||||
after_underscore = False
|
||||
for c in path_name:
|
||||
if c.isupper():
|
||||
raise Error('Fail to print FieldMask to Json string: Path name '
|
||||
'{0} must not contain uppercase letters.'.format(path_name))
|
||||
raise ValueError(
|
||||
'Fail to print FieldMask to Json string: Path name '
|
||||
'{0} must not contain uppercase letters.'.format(path_name))
|
||||
if after_underscore:
|
||||
if c.islower():
|
||||
result.append(c.upper())
|
||||
after_underscore = False
|
||||
else:
|
||||
raise Error('Fail to print FieldMask to Json string: The '
|
||||
'character after a "_" must be a lowercase letter '
|
||||
'in path name {0}.'.format(path_name))
|
||||
raise ValueError(
|
||||
'Fail to print FieldMask to Json string: The '
|
||||
'character after a "_" must be a lowercase letter '
|
||||
'in path name {0}.'.format(path_name))
|
||||
elif c == '_':
|
||||
after_underscore = True
|
||||
else:
|
||||
result += c
|
||||
|
||||
if after_underscore:
|
||||
raise Error('Fail to print FieldMask to Json string: Trailing "_" '
|
||||
'in path name {0}.'.format(path_name))
|
||||
raise ValueError('Fail to print FieldMask to Json string: Trailing "_" '
|
||||
'in path name {0}.'.format(path_name))
|
||||
return ''.join(result)
|
||||
|
||||
|
||||
@@ -528,7 +551,7 @@ def _CamelCaseToSnakeCase(path_name):
|
||||
result = []
|
||||
for c in path_name:
|
||||
if c == '_':
|
||||
raise ParseError('Fail to parse FieldMask: Path name '
|
||||
raise ValueError('Fail to parse FieldMask: Path name '
|
||||
'{0} must not contain "_"s.'.format(path_name))
|
||||
if c.isupper():
|
||||
result += '_'
|
||||
@@ -551,6 +574,8 @@ class _FieldMaskTree(object):
|
||||
In the tree, each leaf node represents a field path.
|
||||
"""
|
||||
|
||||
__slots__ = ('_root',)
|
||||
|
||||
def __init__(self, field_mask=None):
|
||||
"""Initializes the tree by FieldMask."""
|
||||
self._root = {}
|
||||
@@ -662,11 +687,7 @@ def _MergeMessage(
|
||||
destination.ClearField(_StrConvert(name))
|
||||
repeated_source = getattr(source, name)
|
||||
repeated_destination = getattr(destination, name)
|
||||
if field.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
for item in repeated_source:
|
||||
repeated_destination.add().MergeFrom(item)
|
||||
else:
|
||||
repeated_destination.extend(repeated_source)
|
||||
repeated_destination.MergeFrom(repeated_source)
|
||||
else:
|
||||
if field.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
|
||||
if replace_message:
|
||||
@@ -679,7 +700,7 @@ def _MergeMessage(
|
||||
|
||||
def _AddFieldPaths(node, prefix, field_mask):
|
||||
"""Adds the field paths descended from node to field_mask."""
|
||||
if not node:
|
||||
if not node and prefix:
|
||||
field_mask.paths.append(prefix)
|
||||
return
|
||||
for name in sorted(node):
|
||||
@@ -690,9 +711,6 @@ def _AddFieldPaths(node, prefix, field_mask):
|
||||
_AddFieldPaths(node[name], child_path, field_mask)
|
||||
|
||||
|
||||
_INT_OR_FLOAT = six.integer_types + (float,)
|
||||
|
||||
|
||||
def _SetStructValue(struct_value, value):
|
||||
if value is None:
|
||||
struct_value.null_value = 0
|
||||
@@ -700,14 +718,14 @@ def _SetStructValue(struct_value, value):
|
||||
# Note: this check must come before the number check because in Python
|
||||
# True and False are also considered numbers.
|
||||
struct_value.bool_value = value
|
||||
elif isinstance(value, six.string_types):
|
||||
elif isinstance(value, str):
|
||||
struct_value.string_value = value
|
||||
elif isinstance(value, _INT_OR_FLOAT):
|
||||
elif isinstance(value, (int, float)):
|
||||
struct_value.number_value = value
|
||||
elif isinstance(value, dict):
|
||||
elif isinstance(value, (dict, Struct)):
|
||||
struct_value.struct_value.Clear()
|
||||
struct_value.struct_value.update(value)
|
||||
elif isinstance(value, list):
|
||||
elif isinstance(value, (list, ListValue)):
|
||||
struct_value.list_value.Clear()
|
||||
struct_value.list_value.extend(value)
|
||||
else:
|
||||
@@ -735,7 +753,7 @@ def _GetStructValue(struct_value):
|
||||
class Struct(object):
|
||||
"""Class for Struct message type."""
|
||||
|
||||
__slots__ = []
|
||||
__slots__ = ()
|
||||
|
||||
def __getitem__(self, key):
|
||||
return _GetStructValue(self.fields[key])
|
||||
@@ -782,12 +800,14 @@ class Struct(object):
|
||||
for key, value in dictionary.items():
|
||||
_SetStructValue(self.fields[key], value)
|
||||
|
||||
collections.MutableMapping.register(Struct)
|
||||
collections.abc.MutableMapping.register(Struct)
|
||||
|
||||
|
||||
class ListValue(object):
|
||||
"""Class for ListValue message type."""
|
||||
|
||||
__slots__ = ()
|
||||
|
||||
def __len__(self):
|
||||
return len(self.values)
|
||||
|
||||
@@ -826,7 +846,7 @@ class ListValue(object):
|
||||
list_value.Clear()
|
||||
return list_value
|
||||
|
||||
collections.MutableSequence.register(ListValue)
|
||||
collections.abc.MutableSequence.register(ListValue)
|
||||
|
||||
|
||||
WKTBASES = {
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -34,19 +32,16 @@
|
||||
|
||||
__author__ = 'jieluo@google.com (Jie Luo)'
|
||||
|
||||
import collections
|
||||
from datetime import datetime
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import collections.abc as collections_abc
|
||||
import datetime
|
||||
import unittest
|
||||
|
||||
from google.protobuf import any_pb2
|
||||
from google.protobuf import duration_pb2
|
||||
from google.protobuf import field_mask_pb2
|
||||
from google.protobuf import struct_pb2
|
||||
from google.protobuf import timestamp_pb2
|
||||
from google.protobuf import map_unittest_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
from google.protobuf.internal import any_test_pb2
|
||||
from google.protobuf.internal import test_util
|
||||
@@ -240,14 +235,42 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
|
||||
def testDatetimeConverison(self):
|
||||
message = timestamp_pb2.Timestamp()
|
||||
dt = datetime(1970, 1, 1)
|
||||
dt = datetime.datetime(1970, 1, 1)
|
||||
message.FromDatetime(dt)
|
||||
self.assertEqual(dt, message.ToDatetime())
|
||||
|
||||
message.FromMilliseconds(1999)
|
||||
self.assertEqual(datetime(1970, 1, 1, 0, 0, 1, 999000),
|
||||
self.assertEqual(datetime.datetime(1970, 1, 1, 0, 0, 1, 999000),
|
||||
message.ToDatetime())
|
||||
|
||||
dt = datetime.datetime(2555, 2, 22, 1, 2, 3, 456789)
|
||||
message.FromDatetime(dt)
|
||||
self.assertEqual(dt, message.ToDatetime())
|
||||
|
||||
dt = datetime.datetime.max
|
||||
message.FromDatetime(dt)
|
||||
self.assertEqual(dt, message.ToDatetime())
|
||||
|
||||
def testDatetimeConversionWithTimezone(self):
|
||||
class TZ(datetime.tzinfo):
|
||||
|
||||
def utcoffset(self, _):
|
||||
return datetime.timedelta(hours=1)
|
||||
|
||||
def dst(self, _):
|
||||
return datetime.timedelta(0)
|
||||
|
||||
def tzname(self, _):
|
||||
return 'UTC+1'
|
||||
|
||||
message1 = timestamp_pb2.Timestamp()
|
||||
dt = datetime.datetime(1970, 1, 1, 1, tzinfo=TZ())
|
||||
message1.FromDatetime(dt)
|
||||
message2 = timestamp_pb2.Timestamp()
|
||||
dt = datetime.datetime(1970, 1, 1, 0)
|
||||
message2.FromDatetime(dt)
|
||||
self.assertEqual(message1, message2)
|
||||
|
||||
def testTimedeltaConversion(self):
|
||||
message = duration_pb2.Duration()
|
||||
message.FromNanoseconds(1999999999)
|
||||
@@ -273,12 +296,12 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
def testInvalidTimestamp(self):
|
||||
message = timestamp_pb2.Timestamp()
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
'Failed to parse timestamp: missing valid timezone offset.',
|
||||
message.FromJsonString,
|
||||
'')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
'Failed to parse timestamp: invalid trailing data '
|
||||
'1970-01-01T00:00:01Ztrail.',
|
||||
message.FromJsonString,
|
||||
@@ -289,12 +312,12 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
' format \'%Y-%m-%dT%H:%M:%S\'',
|
||||
message.FromJsonString, '10000-01-01T00:00:00.00Z')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
'nanos 0123456789012 more than 9 fractional digits.',
|
||||
message.FromJsonString,
|
||||
'1970-01-01T00:00:00.0123456789012Z')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
(r'Invalid timezone offset value: \+08.'),
|
||||
message.FromJsonString,
|
||||
'1972-01-01T01:00:00.01+08',)
|
||||
@@ -312,43 +335,43 @@ class TimeUtilTest(TimeUtilTestBase):
|
||||
def testInvalidDuration(self):
|
||||
message = duration_pb2.Duration()
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
'Duration must end with letter "s": 1.',
|
||||
message.FromJsonString, '1')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
'Couldn\'t parse duration: 1...2s.',
|
||||
message.FromJsonString, '1...2s')
|
||||
text = '-315576000001.000000000s'
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
r'Duration is not valid\: Seconds -315576000001 must be in range'
|
||||
r' \[-315576000000\, 315576000000\].',
|
||||
message.FromJsonString, text)
|
||||
text = '315576000001.000000000s'
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
r'Duration is not valid\: Seconds 315576000001 must be in range'
|
||||
r' \[-315576000000\, 315576000000\].',
|
||||
message.FromJsonString, text)
|
||||
message.seconds = -315576000001
|
||||
message.nanos = 0
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
r'Duration is not valid\: Seconds -315576000001 must be in range'
|
||||
r' \[-315576000000\, 315576000000\].',
|
||||
message.ToJsonString)
|
||||
message.seconds = 0
|
||||
message.nanos = 999999999 + 1
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
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,
|
||||
ValueError,
|
||||
r'Duration is not valid\: Sign mismatch.',
|
||||
message.ToJsonString)
|
||||
|
||||
@@ -379,6 +402,7 @@ class FieldMaskTest(unittest.TestCase):
|
||||
|
||||
mask.FromJsonString('')
|
||||
self.assertEqual('', mask.ToJsonString())
|
||||
self.assertEqual([], mask.paths)
|
||||
mask.FromJsonString('fooBar')
|
||||
self.assertEqual(['foo_bar'], mask.paths)
|
||||
mask.FromJsonString('fooBar,barQuz')
|
||||
@@ -491,6 +515,8 @@ class FieldMaskTest(unittest.TestCase):
|
||||
mask2.FromJsonString('bar,quz')
|
||||
out_mask.Intersect(mask1, mask2)
|
||||
self.assertEqual('', out_mask.ToJsonString())
|
||||
self.assertEqual(len(out_mask.paths), 0)
|
||||
self.assertEqual(out_mask.paths, [])
|
||||
# Overlap with duplicated paths.
|
||||
mask1.FromJsonString('foo,baz.bb')
|
||||
mask2.FromJsonString('baz.bb,quz')
|
||||
@@ -505,8 +531,17 @@ class FieldMaskTest(unittest.TestCase):
|
||||
mask2.FromJsonString('foo.bar.baz,quz')
|
||||
out_mask.Intersect(mask1, mask2)
|
||||
self.assertEqual('foo.bar.baz', out_mask.ToJsonString())
|
||||
# Intersect '' with ''
|
||||
mask1.Clear()
|
||||
mask2.Clear()
|
||||
mask1.paths.append('')
|
||||
mask2.paths.append('')
|
||||
self.assertEqual(mask1.paths, [''])
|
||||
self.assertEqual('', mask1.ToJsonString())
|
||||
out_mask.Intersect(mask1, mask2)
|
||||
self.assertEqual(out_mask.paths, [])
|
||||
|
||||
def testMergeMessage(self):
|
||||
def testMergeMessageWithoutMapFields(self):
|
||||
# Test merge one field.
|
||||
src = unittest_pb2.TestAllTypes()
|
||||
test_util.SetAllFields(src)
|
||||
@@ -615,6 +650,29 @@ class FieldMaskTest(unittest.TestCase):
|
||||
self.assertTrue(dst.HasField('foo_message'))
|
||||
self.assertFalse(dst.HasField('foo_lazy_message'))
|
||||
|
||||
def testMergeMessageWithMapField(self):
|
||||
empty_map = map_unittest_pb2.TestRecursiveMapMessage()
|
||||
src_level_2 = map_unittest_pb2.TestRecursiveMapMessage()
|
||||
src_level_2.a['src level 2'].CopyFrom(empty_map)
|
||||
src = map_unittest_pb2.TestRecursiveMapMessage()
|
||||
src.a['common key'].CopyFrom(src_level_2)
|
||||
src.a['src level 1'].CopyFrom(src_level_2)
|
||||
|
||||
dst_level_2 = map_unittest_pb2.TestRecursiveMapMessage()
|
||||
dst_level_2.a['dst level 2'].CopyFrom(empty_map)
|
||||
dst = map_unittest_pb2.TestRecursiveMapMessage()
|
||||
dst.a['common key'].CopyFrom(dst_level_2)
|
||||
dst.a['dst level 1'].CopyFrom(empty_map)
|
||||
|
||||
mask = field_mask_pb2.FieldMask()
|
||||
mask.FromJsonString('a')
|
||||
mask.MergeMessage(src, dst)
|
||||
|
||||
# map from dst is replaced with map from src.
|
||||
self.assertEqual(dst.a['common key'], src_level_2)
|
||||
self.assertEqual(dst.a['src level 1'], src_level_2)
|
||||
self.assertEqual(dst.a['dst level 1'], empty_map)
|
||||
|
||||
def testMergeErrors(self):
|
||||
src = unittest_pb2.TestAllTypes()
|
||||
dst = unittest_pb2.TestAllTypes()
|
||||
@@ -638,7 +696,7 @@ class FieldMaskTest(unittest.TestCase):
|
||||
|
||||
# No uppercase letter is allowed.
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
'Fail to print FieldMask to Json string: Path name Foo must '
|
||||
'not contain uppercase letters.',
|
||||
well_known_types._SnakeCaseToCamelCase,
|
||||
@@ -648,19 +706,19 @@ class FieldMaskTest(unittest.TestCase):
|
||||
# 2. "_" cannot be followed by a digit.
|
||||
# 3. "_" cannot appear as the last character.
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
'Fail to print FieldMask to Json string: The character after a '
|
||||
'"_" must be a lowercase letter in path name foo__bar.',
|
||||
well_known_types._SnakeCaseToCamelCase,
|
||||
'foo__bar')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
'Fail to print FieldMask to Json string: The character after a '
|
||||
'"_" must be a lowercase letter in path name foo_3bar.',
|
||||
well_known_types._SnakeCaseToCamelCase,
|
||||
'foo_3bar')
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.Error,
|
||||
ValueError,
|
||||
'Fail to print FieldMask to Json string: Trailing "_" in path '
|
||||
'name foo_bar_.',
|
||||
well_known_types._SnakeCaseToCamelCase,
|
||||
@@ -674,7 +732,7 @@ class FieldMaskTest(unittest.TestCase):
|
||||
self.assertEqual('foo3_bar',
|
||||
well_known_types._CamelCaseToSnakeCase('foo3Bar'))
|
||||
self.assertRaisesRegexp(
|
||||
well_known_types.ParseError,
|
||||
ValueError,
|
||||
'Fail to parse FieldMask: Path name foo_bar must not contain "_"s.',
|
||||
well_known_types._CamelCaseToSnakeCase,
|
||||
'foo_bar')
|
||||
@@ -684,7 +742,7 @@ class StructTest(unittest.TestCase):
|
||||
|
||||
def testStruct(self):
|
||||
struct = struct_pb2.Struct()
|
||||
self.assertIsInstance(struct, collections.Mapping)
|
||||
self.assertIsInstance(struct, collections_abc.Mapping)
|
||||
self.assertEqual(0, len(struct))
|
||||
struct_class = struct.__class__
|
||||
|
||||
@@ -693,7 +751,7 @@ class StructTest(unittest.TestCase):
|
||||
struct['key3'] = True
|
||||
struct.get_or_create_struct('key4')['subkey'] = 11.0
|
||||
struct_list = struct.get_or_create_list('key5')
|
||||
self.assertIsInstance(struct_list, collections.Sequence)
|
||||
self.assertIsInstance(struct_list, collections_abc.Sequence)
|
||||
struct_list.extend([6, 'seven', True, False, None])
|
||||
struct_list.add_struct()['subkey2'] = 9
|
||||
struct['key6'] = {'subkey': {}}
|
||||
@@ -801,6 +859,15 @@ class StructTest(unittest.TestCase):
|
||||
self.assertEqual([6, True, False, None, inner_struct],
|
||||
list(struct['key5'].items()))
|
||||
|
||||
def testStructAssignment(self):
|
||||
# Tests struct assignment from another struct
|
||||
s1 = struct_pb2.Struct()
|
||||
s2 = struct_pb2.Struct()
|
||||
for value in [1, 'a', [1], ['a'], {'a': 'b'}]:
|
||||
s1['x'] = value
|
||||
s2['x'] = s1['x']
|
||||
self.assertEqual(s1['x'], s2['x'])
|
||||
|
||||
def testMergeFrom(self):
|
||||
struct = struct_pb2.Struct()
|
||||
struct_class = struct.__class__
|
||||
@@ -879,6 +946,17 @@ class AnyTest(unittest.TestCase):
|
||||
raise AttributeError('%s should not have Pack method.' %
|
||||
msg_descriptor.full_name)
|
||||
|
||||
def testUnpackWithNoSlashInTypeUrl(self):
|
||||
msg = any_test_pb2.TestAny()
|
||||
all_types = unittest_pb2.TestAllTypes()
|
||||
all_descriptor = all_types.DESCRIPTOR
|
||||
msg.value.Pack(all_types)
|
||||
# Reset type_url to part of type_url after '/'
|
||||
msg.value.type_url = msg.value.TypeName()
|
||||
self.assertFalse(msg.value.Is(all_descriptor))
|
||||
unpacked_message = unittest_pb2.TestAllTypes()
|
||||
self.assertFalse(msg.value.Unpack(unpacked_message))
|
||||
|
||||
def testMessageName(self):
|
||||
# Creates and sets message.
|
||||
submessage = any_test_pb2.TestAny()
|
||||
|
||||
Executable → Regular
File mode changed.
Executable → Regular
+1
-6
@@ -1,5 +1,3 @@
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
@@ -34,10 +32,7 @@
|
||||
|
||||
__author__ = 'robinson@google.com (Will Robinson)'
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
import unittest
|
||||
|
||||
from google.protobuf import message
|
||||
from google.protobuf.internal import wire_format
|
||||
|
||||
@@ -42,24 +42,16 @@ 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
|
||||
# pylint: enable=g-statement-before-imports,g-import-not-at-top
|
||||
|
||||
import base64
|
||||
from collections import OrderedDict
|
||||
import json
|
||||
import math
|
||||
|
||||
from operator import methodcaller
|
||||
|
||||
import re
|
||||
import sys
|
||||
|
||||
import six
|
||||
|
||||
from google.protobuf.internal import type_checkers
|
||||
from google.protobuf import descriptor
|
||||
from google.protobuf import symbol_database
|
||||
|
||||
@@ -77,9 +69,8 @@ _INFINITY = 'Infinity'
|
||||
_NEG_INFINITY = '-Infinity'
|
||||
_NAN = 'NaN'
|
||||
|
||||
_UNPAIRED_SURROGATE_PATTERN = re.compile(six.u(
|
||||
r'[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]'
|
||||
))
|
||||
_UNPAIRED_SURROGATE_PATTERN = re.compile(
|
||||
u'[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]')
|
||||
|
||||
_VALID_EXTENSION_NAME = re.compile(r'\[[a-zA-Z0-9\._]*\]$')
|
||||
|
||||
@@ -96,12 +87,15 @@ class ParseError(Error):
|
||||
"""Thrown in case of parsing error."""
|
||||
|
||||
|
||||
def MessageToJson(message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
indent=2,
|
||||
sort_keys=False,
|
||||
use_integers_for_enums=False):
|
||||
def MessageToJson(
|
||||
message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
indent=2,
|
||||
sort_keys=False,
|
||||
use_integers_for_enums=False,
|
||||
descriptor_pool=None,
|
||||
float_precision=None):
|
||||
"""Converts protobuf message to JSON format.
|
||||
|
||||
Args:
|
||||
@@ -117,20 +111,29 @@ def MessageToJson(message,
|
||||
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.
|
||||
descriptor_pool: A Descriptor Pool for resolving types. If None use the
|
||||
default.
|
||||
float_precision: If set, use this to specify float field valid digits.
|
||||
|
||||
Returns:
|
||||
A string containing the JSON formatted protocol buffer message.
|
||||
"""
|
||||
printer = _Printer(including_default_value_fields,
|
||||
preserving_proto_field_name,
|
||||
use_integers_for_enums)
|
||||
printer = _Printer(
|
||||
including_default_value_fields,
|
||||
preserving_proto_field_name,
|
||||
use_integers_for_enums,
|
||||
descriptor_pool,
|
||||
float_precision=float_precision)
|
||||
return printer.ToJsonString(message, indent, sort_keys)
|
||||
|
||||
|
||||
def MessageToDict(message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
use_integers_for_enums=False):
|
||||
def MessageToDict(
|
||||
message,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
use_integers_for_enums=False,
|
||||
descriptor_pool=None,
|
||||
float_precision=None):
|
||||
"""Converts protobuf message to a dictionary.
|
||||
|
||||
When the dictionary is encoded to JSON, it conforms to proto3 JSON spec.
|
||||
@@ -145,13 +148,19 @@ def MessageToDict(message,
|
||||
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.
|
||||
descriptor_pool: A Descriptor Pool for resolving types. If None use the
|
||||
default.
|
||||
float_precision: If set, use this to specify float field valid digits.
|
||||
|
||||
Returns:
|
||||
A dict representation of the protocol buffer message.
|
||||
"""
|
||||
printer = _Printer(including_default_value_fields,
|
||||
preserving_proto_field_name,
|
||||
use_integers_for_enums)
|
||||
printer = _Printer(
|
||||
including_default_value_fields,
|
||||
preserving_proto_field_name,
|
||||
use_integers_for_enums,
|
||||
descriptor_pool,
|
||||
float_precision=float_precision)
|
||||
# pylint: disable=protected-access
|
||||
return printer._MessageToJsonObject(message)
|
||||
|
||||
@@ -165,13 +174,21 @@ def _IsMapEntry(field):
|
||||
class _Printer(object):
|
||||
"""JSON format printer for protocol message."""
|
||||
|
||||
def __init__(self,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
use_integers_for_enums=False):
|
||||
def __init__(
|
||||
self,
|
||||
including_default_value_fields=False,
|
||||
preserving_proto_field_name=False,
|
||||
use_integers_for_enums=False,
|
||||
descriptor_pool=None,
|
||||
float_precision=None):
|
||||
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
|
||||
self.descriptor_pool = descriptor_pool
|
||||
if float_precision:
|
||||
self.float_format = '.{}g'.format(float_precision)
|
||||
else:
|
||||
self.float_format = None
|
||||
|
||||
def ToJsonString(self, message, indent, sort_keys):
|
||||
js = self._MessageToJsonObject(message)
|
||||
@@ -209,7 +226,7 @@ class _Printer(object):
|
||||
else:
|
||||
recorded_key = 'false'
|
||||
else:
|
||||
recorded_key = key
|
||||
recorded_key = str(key)
|
||||
js_map[recorded_key] = self._FieldToJsonObject(
|
||||
v_field, value[key])
|
||||
js[name] = js_map
|
||||
@@ -218,12 +235,7 @@ class _Printer(object):
|
||||
js[name] = [self._FieldToJsonObject(field, k)
|
||||
for k in value]
|
||||
elif field.is_extension:
|
||||
f = field
|
||||
if (f.containing_type.GetOptions().message_set_wire_format and
|
||||
f.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
|
||||
f.label == descriptor.FieldDescriptor.LABEL_OPTIONAL):
|
||||
f = f.message_type
|
||||
name = '[%s.%s]' % (f.full_name, name)
|
||||
name = '[%s]' % field.full_name
|
||||
js[name] = self._FieldToJsonObject(field, value)
|
||||
else:
|
||||
js[name] = self._FieldToJsonObject(field, value)
|
||||
@@ -242,7 +254,7 @@ class _Printer(object):
|
||||
else:
|
||||
name = field.json_name
|
||||
if name in js:
|
||||
# Skip the field which has been serailized already.
|
||||
# Skip the field which has been serialized already.
|
||||
continue
|
||||
if _IsMapEntry(field):
|
||||
js[name] = {}
|
||||
@@ -264,6 +276,8 @@ class _Printer(object):
|
||||
elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM:
|
||||
if self.use_integers_for_enums:
|
||||
return value
|
||||
if field.enum_type.full_name == 'google.protobuf.NullValue':
|
||||
return None
|
||||
enum_value = field.enum_type.values_by_number.get(value, None)
|
||||
if enum_value is not None:
|
||||
return enum_value.name
|
||||
@@ -290,6 +304,12 @@ class _Printer(object):
|
||||
return _INFINITY
|
||||
if math.isnan(value):
|
||||
return _NAN
|
||||
if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_FLOAT:
|
||||
if self.float_format:
|
||||
return float(format(value, self.float_format))
|
||||
else:
|
||||
return type_checkers.ToShortestFloat(value)
|
||||
|
||||
return value
|
||||
|
||||
def _AnyMessageToJsonObject(self, message):
|
||||
@@ -300,7 +320,7 @@ class _Printer(object):
|
||||
js = OrderedDict()
|
||||
type_url = message.type_url
|
||||
js['@type'] = type_url
|
||||
sub_message = _CreateMessageFromTypeUrl(type_url)
|
||||
sub_message = _CreateMessageFromTypeUrl(type_url, self.descriptor_pool)
|
||||
sub_message.ParseFromString(message.value)
|
||||
message_descriptor = sub_message.DESCRIPTOR
|
||||
full_name = message_descriptor.full_name
|
||||
@@ -366,13 +386,13 @@ def _DuplicateChecker(js):
|
||||
return result
|
||||
|
||||
|
||||
def _CreateMessageFromTypeUrl(type_url):
|
||||
# TODO(jieluo): Should add a way that users can register the type resolver
|
||||
# instead of the default one.
|
||||
def _CreateMessageFromTypeUrl(type_url, descriptor_pool):
|
||||
"""Creates a message from a type URL."""
|
||||
db = symbol_database.Default()
|
||||
pool = db.pool if descriptor_pool is None else descriptor_pool
|
||||
type_name = type_url.split('/')[-1]
|
||||
try:
|
||||
message_descriptor = db.pool.FindMessageTypeByName(type_name)
|
||||
message_descriptor = pool.FindMessageTypeByName(type_name)
|
||||
except KeyError:
|
||||
raise TypeError(
|
||||
'Can not find message descriptor by type_url: {0}.'.format(type_url))
|
||||
@@ -380,13 +400,15 @@ def _CreateMessageFromTypeUrl(type_url):
|
||||
return message_class()
|
||||
|
||||
|
||||
def Parse(text, message, ignore_unknown_fields=False):
|
||||
def Parse(text, message, ignore_unknown_fields=False, descriptor_pool=None):
|
||||
"""Parses a JSON representation of a protocol message into a message.
|
||||
|
||||
Args:
|
||||
text: Message JSON representation.
|
||||
message: A protocol buffer message to merge into.
|
||||
ignore_unknown_fields: If True, do not raise errors for unknown fields.
|
||||
descriptor_pool: A Descriptor Pool for resolving types. If None use the
|
||||
default.
|
||||
|
||||
Returns:
|
||||
The same message passed as argument.
|
||||
@@ -394,43 +416,45 @@ def Parse(text, message, ignore_unknown_fields=False):
|
||||
Raises::
|
||||
ParseError: On JSON parsing problems.
|
||||
"""
|
||||
if not isinstance(text, six.text_type): text = text.decode('utf-8')
|
||||
if not isinstance(text, str):
|
||||
text = text.decode('utf-8')
|
||||
try:
|
||||
if sys.version_info < (2, 7):
|
||||
# object_pair_hook is not supported before python2.7
|
||||
js = json.loads(text)
|
||||
else:
|
||||
js = json.loads(text, object_pairs_hook=_DuplicateChecker)
|
||||
js = json.loads(text, object_pairs_hook=_DuplicateChecker)
|
||||
except ValueError as e:
|
||||
raise ParseError('Failed to load JSON: {0}.'.format(str(e)))
|
||||
return ParseDict(js, message, ignore_unknown_fields)
|
||||
return ParseDict(js, message, ignore_unknown_fields, descriptor_pool)
|
||||
|
||||
|
||||
def ParseDict(js_dict, message, ignore_unknown_fields=False):
|
||||
def ParseDict(js_dict,
|
||||
message,
|
||||
ignore_unknown_fields=False,
|
||||
descriptor_pool=None):
|
||||
"""Parses a JSON dictionary representation into a message.
|
||||
|
||||
Args:
|
||||
js_dict: Dict representation of a JSON message.
|
||||
message: A protocol buffer message to merge into.
|
||||
ignore_unknown_fields: If True, do not raise errors for unknown fields.
|
||||
descriptor_pool: A Descriptor Pool for resolving types. If None use the
|
||||
default.
|
||||
|
||||
Returns:
|
||||
The same message passed as argument.
|
||||
"""
|
||||
parser = _Parser(ignore_unknown_fields)
|
||||
parser = _Parser(ignore_unknown_fields, descriptor_pool)
|
||||
parser.ConvertMessage(js_dict, message)
|
||||
return message
|
||||
|
||||
|
||||
_INT_OR_FLOAT = six.integer_types + (float,)
|
||||
_INT_OR_FLOAT = (int, float)
|
||||
|
||||
|
||||
class _Parser(object):
|
||||
"""JSON format parser for protocol message."""
|
||||
|
||||
def __init__(self,
|
||||
ignore_unknown_fields):
|
||||
def __init__(self, ignore_unknown_fields, descriptor_pool):
|
||||
self.ignore_unknown_fields = ignore_unknown_fields
|
||||
self.descriptor_pool = descriptor_pool
|
||||
|
||||
def ConvertMessage(self, value, message):
|
||||
"""Convert a JSON object into a message.
|
||||
@@ -475,10 +499,16 @@ class _Parser(object):
|
||||
raise ParseError('Message type {0} does not have extensions'.format(
|
||||
message_descriptor.full_name))
|
||||
identifier = name[1:-1] # strip [] brackets
|
||||
identifier = '.'.join(identifier.split('.')[:-1])
|
||||
# pylint: disable=protected-access
|
||||
field = message.Extensions._FindExtensionByName(identifier)
|
||||
# pylint: enable=protected-access
|
||||
if not field:
|
||||
# Try looking for extension by the message type name, dropping the
|
||||
# field name following the final . separator in full_name.
|
||||
identifier = '.'.join(identifier.split('.')[:-1])
|
||||
# pylint: disable=protected-access
|
||||
field = message.Extensions._FindExtensionByName(identifier)
|
||||
# pylint: enable=protected-access
|
||||
if not field:
|
||||
if self.ignore_unknown_fields:
|
||||
continue
|
||||
@@ -486,14 +516,15 @@ class _Parser(object):
|
||||
('Message type "{0}" has no field named "{1}".\n'
|
||||
' Available Fields(except extensions): {2}').format(
|
||||
message_descriptor.full_name, name,
|
||||
message_descriptor.fields))
|
||||
[f.json_name for f in message_descriptor.fields]))
|
||||
if name in names:
|
||||
raise ParseError('Message type "{0}" should not have multiple '
|
||||
'"{1}" fields.'.format(
|
||||
message.DESCRIPTOR.full_name, name))
|
||||
names.append(name)
|
||||
value = js[name]
|
||||
# Check no other oneof field is parsed.
|
||||
if field.containing_oneof is not None:
|
||||
if field.containing_oneof is not None and value is not None:
|
||||
oneof_name = field.containing_oneof.name
|
||||
if oneof_name in names:
|
||||
raise ParseError('Message type "{0}" should not have multiple '
|
||||
@@ -501,12 +532,14 @@ class _Parser(object):
|
||||
message.DESCRIPTOR.full_name, oneof_name))
|
||||
names.append(oneof_name)
|
||||
|
||||
value = js[name]
|
||||
if value is None:
|
||||
if (field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE
|
||||
and field.message_type.full_name == 'google.protobuf.Value'):
|
||||
sub_message = getattr(message, field.name)
|
||||
sub_message.null_value = 0
|
||||
elif (field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM
|
||||
and field.enum_type.full_name == 'google.protobuf.NullValue'):
|
||||
setattr(message, field.name, 0)
|
||||
else:
|
||||
message.ClearField(field.name)
|
||||
continue
|
||||
@@ -546,10 +579,13 @@ class _Parser(object):
|
||||
sub_message.SetInParent()
|
||||
self.ConvertMessage(value, sub_message)
|
||||
else:
|
||||
setattr(message, field.name, _ConvertScalarFieldValue(value, field))
|
||||
if field.is_extension:
|
||||
message.Extensions[field] = _ConvertScalarFieldValue(value, field)
|
||||
else:
|
||||
setattr(message, field.name, _ConvertScalarFieldValue(value, field))
|
||||
except ParseError as e:
|
||||
if field and field.containing_oneof is None:
|
||||
raise ParseError('Failed to parse {0} field: {1}'.format(name, e))
|
||||
raise ParseError('Failed to parse {0} field: {1}.'.format(name, e))
|
||||
else:
|
||||
raise ParseError(str(e))
|
||||
except ValueError as e:
|
||||
@@ -566,7 +602,7 @@ class _Parser(object):
|
||||
except KeyError:
|
||||
raise ParseError('@type is missing when parsing any message.')
|
||||
|
||||
sub_message = _CreateMessageFromTypeUrl(type_url)
|
||||
sub_message = _CreateMessageFromTypeUrl(type_url, self.descriptor_pool)
|
||||
message_descriptor = sub_message.DESCRIPTOR
|
||||
full_name = message_descriptor.full_name
|
||||
if _IsWrapperMessage(message_descriptor):
|
||||
@@ -577,6 +613,7 @@ class _Parser(object):
|
||||
else:
|
||||
del value['@type']
|
||||
self._ConvertFieldValuePair(value, sub_message)
|
||||
value['@type'] = type_url
|
||||
# Sets Any message
|
||||
message.value = sub_message.SerializeToString()
|
||||
message.type_url = type_url
|
||||
@@ -585,7 +622,10 @@ class _Parser(object):
|
||||
"""Convert a JSON representation into message with FromJsonString."""
|
||||
# Duration, Timestamp, FieldMask have a FromJsonString method to do the
|
||||
# conversion. Users can also call the method directly.
|
||||
message.FromJsonString(value)
|
||||
try:
|
||||
message.FromJsonString(value)
|
||||
except ValueError as e:
|
||||
raise ParseError(e)
|
||||
|
||||
def _ConvertValueMessage(self, value, message):
|
||||
"""Convert a JSON representation into Value message."""
|
||||
@@ -597,12 +637,13 @@ class _Parser(object):
|
||||
message.null_value = 0
|
||||
elif isinstance(value, bool):
|
||||
message.bool_value = value
|
||||
elif isinstance(value, six.string_types):
|
||||
elif isinstance(value, str):
|
||||
message.string_value = value
|
||||
elif isinstance(value, _INT_OR_FLOAT):
|
||||
message.number_value = value
|
||||
else:
|
||||
raise ParseError('Unexpected type for Value message.')
|
||||
raise ParseError('Value {0} has unexpected type {1}.'.format(
|
||||
value, type(value)))
|
||||
|
||||
def _ConvertListValueMessage(self, value, message):
|
||||
"""Convert a JSON representation into ListValue message."""
|
||||
@@ -618,6 +659,9 @@ class _Parser(object):
|
||||
if not isinstance(value, dict):
|
||||
raise ParseError(
|
||||
'Struct must be in a dict which is {0}.'.format(value))
|
||||
# Clear will mark the struct as modified so it will be created even if
|
||||
# there are no values.
|
||||
message.Clear()
|
||||
for key in value:
|
||||
self._ConvertValueMessage(value[key], message.fields[key])
|
||||
return
|
||||
@@ -671,12 +715,18 @@ def _ConvertScalarFieldValue(value, field, require_str=False):
|
||||
if field.cpp_type in _INT_TYPES:
|
||||
return _ConvertInteger(value)
|
||||
elif field.cpp_type in _FLOAT_TYPES:
|
||||
return _ConvertFloat(value)
|
||||
return _ConvertFloat(value, field)
|
||||
elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_BOOL:
|
||||
return _ConvertBool(value, require_str)
|
||||
elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING:
|
||||
if field.type == descriptor.FieldDescriptor.TYPE_BYTES:
|
||||
return base64.b64decode(value)
|
||||
if isinstance(value, str):
|
||||
encoded = value.encode('utf-8')
|
||||
else:
|
||||
encoded = value
|
||||
# Add extra padding '='
|
||||
padded_value = encoded + b'=' * (4 - len(encoded) % 4)
|
||||
return base64.urlsafe_b64decode(padded_value)
|
||||
else:
|
||||
# Checking for unpaired surrogates appears to be unreliable,
|
||||
# depending on the specific Python version, so we check manually.
|
||||
@@ -717,14 +767,35 @@ def _ConvertInteger(value):
|
||||
if isinstance(value, float) and not value.is_integer():
|
||||
raise ParseError('Couldn\'t parse integer: {0}.'.format(value))
|
||||
|
||||
if isinstance(value, six.text_type) and value.find(' ') != -1:
|
||||
if isinstance(value, str) and value.find(' ') != -1:
|
||||
raise ParseError('Couldn\'t parse integer: "{0}".'.format(value))
|
||||
|
||||
if isinstance(value, bool):
|
||||
raise ParseError('Bool value {0} is not acceptable for '
|
||||
'integer field.'.format(value))
|
||||
|
||||
return int(value)
|
||||
|
||||
|
||||
def _ConvertFloat(value):
|
||||
def _ConvertFloat(value, field):
|
||||
"""Convert an floating point number."""
|
||||
if isinstance(value, float):
|
||||
if math.isnan(value):
|
||||
raise ParseError('Couldn\'t parse NaN, use quoted "NaN" instead.')
|
||||
if math.isinf(value):
|
||||
if value > 0:
|
||||
raise ParseError('Couldn\'t parse Infinity or value too large, '
|
||||
'use quoted "Infinity" instead.')
|
||||
else:
|
||||
raise ParseError('Couldn\'t parse -Infinity or value too small, '
|
||||
'use quoted "-Infinity" instead.')
|
||||
if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_FLOAT:
|
||||
# pylint: disable=protected-access
|
||||
if value > type_checkers._FLOAT_MAX:
|
||||
raise ParseError('Float value too large')
|
||||
# pylint: disable=protected-access
|
||||
if value < type_checkers._FLOAT_MIN:
|
||||
raise ParseError('Float value too small')
|
||||
if value == 'nan':
|
||||
raise ParseError('Couldn\'t parse float "nan", use "NaN" instead.')
|
||||
try:
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
Executable → Regular
+178
-65
@@ -36,9 +36,19 @@
|
||||
|
||||
__author__ = 'robinson@google.com (Will Robinson)'
|
||||
|
||||
class Error(Exception): pass
|
||||
class DecodeError(Error): pass
|
||||
class EncodeError(Error): pass
|
||||
class Error(Exception):
|
||||
"""Base error type for this module."""
|
||||
pass
|
||||
|
||||
|
||||
class DecodeError(Error):
|
||||
"""Exception raised when deserializing messages."""
|
||||
pass
|
||||
|
||||
|
||||
class EncodeError(Error):
|
||||
"""Exception raised when serializing messages."""
|
||||
pass
|
||||
|
||||
|
||||
class Message(object):
|
||||
@@ -48,22 +58,23 @@ class Message(object):
|
||||
Protocol message classes are almost always generated by the protocol
|
||||
compiler. These generated types subclass Message and implement the methods
|
||||
shown below.
|
||||
|
||||
TODO(robinson): Link to an HTML document here.
|
||||
|
||||
TODO(robinson): Document that instances of this class will also
|
||||
have an Extensions attribute with __getitem__ and __setitem__.
|
||||
Again, not sure how to best convey this.
|
||||
|
||||
TODO(robinson): Document that the class must also have a static
|
||||
RegisterExtension(extension_field) method.
|
||||
Not sure how to best express at this point.
|
||||
"""
|
||||
|
||||
# TODO(robinson): Link to an HTML document here.
|
||||
|
||||
# TODO(robinson): Document that instances of this class will also
|
||||
# have an Extensions attribute with __getitem__ and __setitem__.
|
||||
# Again, not sure how to best convey this.
|
||||
|
||||
# TODO(robinson): Document that the class must also have a static
|
||||
# RegisterExtension(extension_field) method.
|
||||
# Not sure how to best express at this point.
|
||||
|
||||
# TODO(robinson): Document these fields and methods.
|
||||
|
||||
__slots__ = []
|
||||
|
||||
#: The :class:`google.protobuf.descriptor.Descriptor` for this message type.
|
||||
DESCRIPTOR = None
|
||||
|
||||
def __deepcopy__(self, memo=None):
|
||||
@@ -99,7 +110,7 @@ class Message(object):
|
||||
appended. Singular sub-messages and groups are recursively merged.
|
||||
|
||||
Args:
|
||||
other_msg: Message to merge into the current message.
|
||||
other_msg (Message): A message to merge into the current message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@@ -110,7 +121,7 @@ class Message(object):
|
||||
message using MergeFrom.
|
||||
|
||||
Args:
|
||||
other_msg: Message to copy into the current one.
|
||||
other_msg (Message): A message to copy into the current one.
|
||||
"""
|
||||
if self is other_msg:
|
||||
return
|
||||
@@ -127,15 +138,16 @@ class Message(object):
|
||||
This normally happens automatically when you assign a field of a
|
||||
sub-message, but sometimes you want to make the sub-message
|
||||
present while keeping it empty. If you find yourself using this,
|
||||
you may want to reconsider your design."""
|
||||
you may want to reconsider your design.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def IsInitialized(self):
|
||||
"""Checks if the message is initialized.
|
||||
|
||||
Returns:
|
||||
The method returns True if the message is initialized (i.e. all of its
|
||||
required fields are set).
|
||||
bool: The method returns True if the message is initialized (i.e. all of
|
||||
its required fields are set).
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@@ -148,57 +160,57 @@ class Message(object):
|
||||
def MergeFromString(self, serialized):
|
||||
"""Merges serialized protocol buffer data into this message.
|
||||
|
||||
When we find a field in |serialized| that is already present
|
||||
When we find a field in `serialized` that is already present
|
||||
in this message:
|
||||
- If it's a "repeated" field, we append to the end of our list.
|
||||
- Else, if it's a scalar, we overwrite our field.
|
||||
- Else, (it's a nonrepeated composite), we recursively merge
|
||||
|
||||
- If it's a "repeated" field, we append to the end of our list.
|
||||
- Else, if it's a scalar, we overwrite our field.
|
||||
- Else, (it's a nonrepeated composite), we recursively merge
|
||||
into the existing composite.
|
||||
|
||||
TODO(robinson): Document handling of unknown fields.
|
||||
|
||||
Args:
|
||||
serialized: Any object that allows us to call buffer(serialized)
|
||||
to access a string of bytes using the buffer interface.
|
||||
|
||||
TODO(robinson): When we switch to a helper, this will return None.
|
||||
serialized (bytes): Any object that allows us to call
|
||||
``memoryview(serialized)`` to access a string of bytes using the
|
||||
buffer interface.
|
||||
|
||||
Returns:
|
||||
The number of bytes read from |serialized|.
|
||||
For non-group messages, this will always be len(serialized),
|
||||
int: The number of bytes read from `serialized`.
|
||||
For non-group messages, this will always be `len(serialized)`,
|
||||
but for messages which are actually groups, this will
|
||||
generally be less than len(serialized), since we must
|
||||
stop when we reach an END_GROUP tag. Note that if
|
||||
we *do* stop because of an END_GROUP tag, the number
|
||||
generally be less than `len(serialized)`, since we must
|
||||
stop when we reach an ``END_GROUP`` tag. Note that if
|
||||
we *do* stop because of an ``END_GROUP`` tag, the number
|
||||
of bytes returned does not include the bytes
|
||||
for the END_GROUP tag information.
|
||||
for the ``END_GROUP`` tag information.
|
||||
|
||||
Raises:
|
||||
DecodeError: if the input cannot be parsed.
|
||||
"""
|
||||
# TODO(robinson): Document handling of unknown fields.
|
||||
# TODO(robinson): When we switch to a helper, this will return None.
|
||||
raise NotImplementedError
|
||||
|
||||
def ParseFromString(self, serialized):
|
||||
"""Parse serialized protocol buffer data into this message.
|
||||
|
||||
Like MergeFromString(), except we clear the object first and
|
||||
do not return the value that MergeFromString returns.
|
||||
Like :func:`MergeFromString()`, except we clear the object first.
|
||||
"""
|
||||
self.Clear()
|
||||
self.MergeFromString(serialized)
|
||||
return self.MergeFromString(serialized)
|
||||
|
||||
def SerializeToString(self, **kwargs):
|
||||
"""Serializes the protocol message to a binary string.
|
||||
|
||||
Arguments:
|
||||
**kwargs: Keyword arguments to the serialize method, accepts
|
||||
the following keyword args:
|
||||
deterministic: If true, requests deterministic serialization of the
|
||||
protobuf, with predictable ordering of map keys.
|
||||
Keyword Args:
|
||||
deterministic (bool): If true, requests deterministic serialization
|
||||
of the protobuf, with predictable ordering of map keys.
|
||||
|
||||
Returns:
|
||||
A binary string representation of the message if all of the required
|
||||
fields in the message are set (i.e. the message is initialized).
|
||||
|
||||
Raises:
|
||||
message.EncodeError if the message isn't initialized.
|
||||
EncodeError: if the message isn't initialized (see :func:`IsInitialized`).
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@@ -208,14 +220,12 @@ class Message(object):
|
||||
This method is similar to SerializeToString but doesn't check if the
|
||||
message is initialized.
|
||||
|
||||
Arguments:
|
||||
**kwargs: Keyword arguments to the serialize method, accepts
|
||||
the following keyword args:
|
||||
deterministic: If true, requests deterministic serialization of the
|
||||
protobuf, with predictable ordering of map keys.
|
||||
Keyword Args:
|
||||
deterministic (bool): If true, requests deterministic serialization
|
||||
of the protobuf, with predictable ordering of map keys.
|
||||
|
||||
Returns:
|
||||
A string representation of the partial message.
|
||||
bytes: A serialized representation of the partial message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@@ -236,47 +246,127 @@ class Message(object):
|
||||
# keywords. So they would become lambda_ or yield_.
|
||||
# """
|
||||
def ListFields(self):
|
||||
"""Returns a list of (FieldDescriptor, value) tuples for all
|
||||
fields in the message which are not empty. A message field is
|
||||
non-empty if HasField() would return true. A singular primitive field
|
||||
is non-empty if HasField() would return true in proto2 or it is non zero
|
||||
in proto3. A repeated field is non-empty if it contains at least one
|
||||
element. The fields are ordered by field number"""
|
||||
"""Returns a list of (FieldDescriptor, value) tuples for present fields.
|
||||
|
||||
A message field is non-empty if HasField() would return true. A singular
|
||||
primitive field is non-empty if HasField() would return true in proto2 or it
|
||||
is non zero in proto3. A repeated field is non-empty if it contains at least
|
||||
one element. The fields are ordered by field number.
|
||||
|
||||
Returns:
|
||||
list[tuple(FieldDescriptor, value)]: field descriptors and values
|
||||
for all fields in the message which are not empty. The values vary by
|
||||
field type.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def HasField(self, field_name):
|
||||
"""Checks if a certain field is set for the message, or if any field inside
|
||||
a oneof group is set. Note that if the field_name is not defined in the
|
||||
message descriptor, ValueError will be raised."""
|
||||
"""Checks if a certain field is set for the message.
|
||||
|
||||
For a oneof group, checks if any field inside is set. Note that if the
|
||||
field_name is not defined in the message descriptor, :exc:`ValueError` will
|
||||
be raised.
|
||||
|
||||
Args:
|
||||
field_name (str): The name of the field to check for presence.
|
||||
|
||||
Returns:
|
||||
bool: Whether a value has been set for the named field.
|
||||
|
||||
Raises:
|
||||
ValueError: if the `field_name` is not a member of this message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def ClearField(self, field_name):
|
||||
"""Clears the contents of a given field, or the field set inside a oneof
|
||||
group. If the name neither refers to a defined field or oneof group,
|
||||
ValueError is raised."""
|
||||
"""Clears the contents of a given field.
|
||||
|
||||
Inside a oneof group, clears the field set. If the name neither refers to a
|
||||
defined field or oneof group, :exc:`ValueError` is raised.
|
||||
|
||||
Args:
|
||||
field_name (str): The name of the field to check for presence.
|
||||
|
||||
Raises:
|
||||
ValueError: if the `field_name` is not a member of this message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def WhichOneof(self, oneof_group):
|
||||
"""Returns the name of the field that is set inside a oneof group, or
|
||||
None if no field is set. If no group with the given name exists, ValueError
|
||||
will be raised."""
|
||||
"""Returns the name of the field that is set inside a oneof group.
|
||||
|
||||
If no field is set, returns None.
|
||||
|
||||
Args:
|
||||
oneof_group (str): the name of the oneof group to check.
|
||||
|
||||
Returns:
|
||||
str or None: The name of the group that is set, or None.
|
||||
|
||||
Raises:
|
||||
ValueError: no group with the given name exists
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def HasExtension(self, extension_handle):
|
||||
"""Checks if a certain extension is present for this message.
|
||||
|
||||
Extensions are retrieved using the :attr:`Extensions` mapping (if present).
|
||||
|
||||
Args:
|
||||
extension_handle: The handle for the extension to check.
|
||||
|
||||
Returns:
|
||||
bool: Whether the extension is present for this message.
|
||||
|
||||
Raises:
|
||||
KeyError: if the extension is repeated. Similar to repeated fields,
|
||||
there is no separate notion of presence: a "not present" repeated
|
||||
extension is an empty list.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def ClearExtension(self, extension_handle):
|
||||
"""Clears the contents of a given extension.
|
||||
|
||||
Args:
|
||||
extension_handle: The handle for the extension to clear.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def UnknownFields(self):
|
||||
"""Returns the UnknownFieldSet.
|
||||
|
||||
Returns:
|
||||
UnknownFieldSet: The unknown fields stored in this message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def DiscardUnknownFields(self):
|
||||
"""Clears all fields in the :class:`UnknownFieldSet`.
|
||||
|
||||
This operation is recursive for nested message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
def ByteSize(self):
|
||||
"""Returns the serialized size of this message.
|
||||
|
||||
Recursively calls ByteSize() on all contained messages.
|
||||
|
||||
Returns:
|
||||
int: The number of bytes required to serialize this message.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@classmethod
|
||||
def FromString(cls, s):
|
||||
raise NotImplementedError
|
||||
|
||||
@staticmethod
|
||||
def RegisterExtension(extension_handle):
|
||||
raise NotImplementedError
|
||||
|
||||
def _SetListener(self, message_listener):
|
||||
"""Internal method used by the protocol message implementation.
|
||||
Clients should not call this directly.
|
||||
@@ -305,4 +395,27 @@ class Message(object):
|
||||
def __setstate__(self, state):
|
||||
"""Support the pickle protocol."""
|
||||
self.__init__()
|
||||
self.ParseFromString(state['serialized'])
|
||||
serialized = state['serialized']
|
||||
# On Python 3, using encoding='latin1' is required for unpickling
|
||||
# protos pickled by Python 2.
|
||||
if not isinstance(serialized, bytes):
|
||||
serialized = serialized.encode('latin1')
|
||||
self.ParseFromString(serialized)
|
||||
|
||||
def __reduce__(self):
|
||||
message_descriptor = self.DESCRIPTOR
|
||||
if message_descriptor.containing_type is None:
|
||||
return type(self), (), self.__getstate__()
|
||||
# the message type must be nested.
|
||||
# Python does not pickle nested classes; use the symbol_database on the
|
||||
# receiving end.
|
||||
container = message_descriptor
|
||||
return (_InternalConstructMessage, (container.full_name,),
|
||||
self.__getstate__())
|
||||
|
||||
|
||||
def _InternalConstructMessage(full_name):
|
||||
"""Constructs a nested message."""
|
||||
from google.protobuf import symbol_database # pylint:disable=g-import-not-at-top
|
||||
|
||||
return symbol_database.Default().GetSymbol(full_name)()
|
||||
@@ -39,9 +39,18 @@ my_proto_instance = message_classes['some.proto.package.MessageName']()
|
||||
|
||||
__author__ = 'matthewtoia@google.com (Matt Toia)'
|
||||
|
||||
from google.protobuf.internal import api_implementation
|
||||
from google.protobuf import descriptor_pool
|
||||
from google.protobuf import message
|
||||
from google.protobuf import reflection
|
||||
|
||||
if api_implementation.Type() == 'cpp':
|
||||
from google.protobuf.pyext import cpp_message as message_impl
|
||||
else:
|
||||
from google.protobuf.internal import python_message as message_impl
|
||||
|
||||
|
||||
# The type of all Message classes.
|
||||
_GENERATED_PROTOCOL_MESSAGE_TYPE = message_impl.GeneratedProtocolMessageType
|
||||
|
||||
|
||||
class MessageFactory(object):
|
||||
@@ -55,7 +64,7 @@ class MessageFactory(object):
|
||||
self._classes = {}
|
||||
|
||||
def GetPrototype(self, descriptor):
|
||||
"""Builds a proto2 message class based on the passed in descriptor.
|
||||
"""Obtains a proto2 message class based on the passed in descriptor.
|
||||
|
||||
Passing a descriptor with a fully qualified name matching a previous
|
||||
invocation will cause the same class to be returned.
|
||||
@@ -67,25 +76,50 @@ class MessageFactory(object):
|
||||
A class describing the passed in descriptor.
|
||||
"""
|
||||
if descriptor not in self._classes:
|
||||
descriptor_name = descriptor.name
|
||||
if str is bytes: # PY2
|
||||
descriptor_name = descriptor.name.encode('ascii', 'ignore')
|
||||
result_class = reflection.GeneratedProtocolMessageType(
|
||||
descriptor_name,
|
||||
(message.Message,),
|
||||
{'DESCRIPTOR': descriptor, '__module__': None})
|
||||
# If module not set, it wrongly points to the reflection.py module.
|
||||
result_class = self.CreatePrototype(descriptor)
|
||||
# The assignment to _classes is redundant for the base implementation, but
|
||||
# might avoid confusion in cases where CreatePrototype gets overridden and
|
||||
# does not call the base implementation.
|
||||
self._classes[descriptor] = result_class
|
||||
for field in descriptor.fields:
|
||||
if field.message_type:
|
||||
self.GetPrototype(field.message_type)
|
||||
for extension in result_class.DESCRIPTOR.extensions:
|
||||
if extension.containing_type not in self._classes:
|
||||
self.GetPrototype(extension.containing_type)
|
||||
extended_class = self._classes[extension.containing_type]
|
||||
extended_class.RegisterExtension(extension)
|
||||
return result_class
|
||||
return self._classes[descriptor]
|
||||
|
||||
def CreatePrototype(self, descriptor):
|
||||
"""Builds a proto2 message class based on the passed in descriptor.
|
||||
|
||||
Don't call this function directly, it always creates a new class. Call
|
||||
GetPrototype() instead. This method is meant to be overridden in subblasses
|
||||
to perform additional operations on the newly constructed class.
|
||||
|
||||
Args:
|
||||
descriptor: The descriptor to build from.
|
||||
|
||||
Returns:
|
||||
A class describing the passed in descriptor.
|
||||
"""
|
||||
descriptor_name = descriptor.name
|
||||
result_class = _GENERATED_PROTOCOL_MESSAGE_TYPE(
|
||||
descriptor_name,
|
||||
(message.Message,),
|
||||
{
|
||||
'DESCRIPTOR': descriptor,
|
||||
# If module not set, it wrongly points to message_factory module.
|
||||
'__module__': None,
|
||||
})
|
||||
result_class._FACTORY = self # pylint: disable=protected-access
|
||||
# Assign in _classes before doing recursive calls to avoid infinite
|
||||
# recursion.
|
||||
self._classes[descriptor] = result_class
|
||||
for field in descriptor.fields:
|
||||
if field.message_type:
|
||||
self.GetPrototype(field.message_type)
|
||||
for extension in result_class.DESCRIPTOR.extensions:
|
||||
if extension.containing_type not in self._classes:
|
||||
self.GetPrototype(extension.containing_type)
|
||||
extended_class = self._classes[extension.containing_type]
|
||||
extended_class.RegisterExtension(extension)
|
||||
return result_class
|
||||
|
||||
def GetMessages(self, files):
|
||||
"""Gets all the messages from a specified file.
|
||||
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
// 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.
|
||||
|
||||
// This file can be included by other C++ libraries, typically extension modules
|
||||
// which want to interact with the Python Messages coming from the "cpp"
|
||||
// implementation of protocol buffers.
|
||||
//
|
||||
// Usage:
|
||||
// Declare a (probably static) variable to hold the API:
|
||||
// const PyProto_API* py_proto_api;
|
||||
// In some initialization function, write:
|
||||
// py_proto_api = static_cast<const PyProto_API*>(PyCapsule_Import(
|
||||
// PyProtoAPICapsuleName(), 0));
|
||||
// if (!py_proto_api) { ...handle ImportError... }
|
||||
// Then use the methods of the returned class:
|
||||
// py_proto_api->GetMessagePointer(...);
|
||||
|
||||
#ifndef GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
|
||||
#define GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/descriptor_database.h>
|
||||
#include <google/protobuf/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace python {
|
||||
|
||||
// Note on the implementation:
|
||||
// This API is designed after
|
||||
// https://docs.python.org/3/extending/extending.html#providing-a-c-api-for-an-extension-module
|
||||
// The class below contains no mutable state, and all methods are "const";
|
||||
// we use a C++ class instead of a C struct with functions pointers just because
|
||||
// the code looks more readable.
|
||||
struct PyProto_API {
|
||||
// The API object is created at initialization time and never freed.
|
||||
// This destructor is never called.
|
||||
virtual ~PyProto_API() {}
|
||||
|
||||
// Operations on Messages.
|
||||
|
||||
// If the passed object is a Python Message, returns its internal pointer.
|
||||
// Otherwise, returns NULL with an exception set.
|
||||
virtual const Message* GetMessagePointer(PyObject* msg) const = 0;
|
||||
|
||||
// If the passed object is a Python Message, returns a mutable pointer.
|
||||
// Otherwise, returns NULL with an exception set.
|
||||
// This function will succeed only if there are no other Python objects
|
||||
// pointing to the message, like submessages or repeated containers.
|
||||
// With the current implementation, only empty messages are in this case.
|
||||
virtual Message* GetMutableMessagePointer(PyObject* msg) const = 0;
|
||||
|
||||
// If the passed object is a Python Message Descriptor, returns its internal
|
||||
// pointer.
|
||||
// Otherwise, returns NULL with an exception set.
|
||||
virtual const Descriptor* MessageDescriptor_AsDescriptor(
|
||||
PyObject* desc) const = 0;
|
||||
|
||||
// If the passed object is a Python Enum Descriptor, returns its internal
|
||||
// pointer.
|
||||
// Otherwise, returns NULL with an exception set.
|
||||
virtual const EnumDescriptor* EnumDescriptor_AsDescriptor(
|
||||
PyObject* enum_desc) const = 0;
|
||||
|
||||
// Expose the underlying DescriptorPool and MessageFactory to enable C++ code
|
||||
// to create Python-compatible message.
|
||||
virtual const DescriptorPool* GetDefaultDescriptorPool() const = 0;
|
||||
virtual MessageFactory* GetDefaultMessageFactory() const = 0;
|
||||
|
||||
// Allocate a new protocol buffer as a python object for the provided
|
||||
// descriptor. This function works even if no Python module has been imported
|
||||
// for the corresponding protocol buffer class.
|
||||
// The factory is usually null; when provided, it is the MessageFactory which
|
||||
// owns the Python class, and will be used to find and create Extensions for
|
||||
// this message.
|
||||
// When null is returned, a python error has already been set.
|
||||
virtual PyObject* NewMessage(const Descriptor* descriptor,
|
||||
PyObject* py_message_factory) const = 0;
|
||||
|
||||
// Allocate a new protocol buffer where the underlying object is owned by C++.
|
||||
// The factory must currently be null. This function works even if no Python
|
||||
// module has been imported for the corresponding protocol buffer class.
|
||||
// When null is returned, a python error has already been set.
|
||||
//
|
||||
// Since this call returns a python object owned by C++, some operations
|
||||
// are risky, and it must be used carefully. In particular:
|
||||
// * Avoid modifying the returned object from the C++ side while there are
|
||||
// existing python references to it or it's subobjects.
|
||||
// * Avoid using python references to this object or any subobjects after the
|
||||
// C++ object has been freed.
|
||||
// * Calling this with the same C++ pointer will result in multiple distinct
|
||||
// python objects referencing the same C++ object.
|
||||
virtual PyObject* NewMessageOwnedExternally(
|
||||
Message* msg, PyObject* py_message_factory) const = 0;
|
||||
|
||||
// Returns a new reference for the given DescriptorPool.
|
||||
// The returned object does not manage the C++ DescriptorPool: it is the
|
||||
// responsibility of the caller to keep it alive.
|
||||
// As long as the returned Python DescriptorPool object is kept alive,
|
||||
// functions that process C++ descriptors or messages created from this pool
|
||||
// can work and return their Python counterparts.
|
||||
virtual PyObject* DescriptorPool_FromPool(
|
||||
const google::protobuf::DescriptorPool* pool) const = 0;
|
||||
};
|
||||
|
||||
inline const char* PyProtoAPICapsuleName() {
|
||||
static const char kCapsuleName[] =
|
||||
"google.protobuf.pyext._message.proto_API";
|
||||
return kCapsuleName;
|
||||
}
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
|
||||
@@ -30,14 +30,12 @@
|
||||
|
||||
"""Dynamic Protobuf class creator."""
|
||||
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from ordereddict import OrderedDict #PY26
|
||||
from collections import OrderedDict
|
||||
import hashlib
|
||||
import os
|
||||
|
||||
from google.protobuf import descriptor_pb2
|
||||
from google.protobuf import descriptor
|
||||
from google.protobuf import message_factory
|
||||
|
||||
|
||||
@@ -124,6 +122,12 @@ def _MakeFileDescriptorProto(proto_file_name, full_name, field_items):
|
||||
for f_number, (f_name, f_type) in enumerate(field_items, 1):
|
||||
field_proto = desc_proto.field.add()
|
||||
field_proto.name = f_name
|
||||
# # If the number falls in the reserved range, reassign it to the correct
|
||||
# # number after the range.
|
||||
if f_number >= descriptor.FieldDescriptor.FIRST_RESERVED_FIELD_NUMBER:
|
||||
f_number += (
|
||||
descriptor.FieldDescriptor.LAST_RESERVED_FIELD_NUMBER -
|
||||
descriptor.FieldDescriptor.FIRST_RESERVED_FIELD_NUMBER + 1)
|
||||
field_proto.number = f_number
|
||||
field_proto.label = descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL
|
||||
field_proto.type = f_type
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
try:
|
||||
__import__('pkg_resources').declare_namespace(__name__)
|
||||
except ImportError:
|
||||
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
|
||||
@@ -30,35 +30,31 @@
|
||||
|
||||
// Author: petar@google.com (Petar Petrov)
|
||||
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
|
||||
#include <Python.h>
|
||||
#include <frameobject.h>
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
#include <google/protobuf/pyext/descriptor_containers.h>
|
||||
#include <google/protobuf/pyext/descriptor_pool.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#define PyString_FromStringAndSize PyUnicode_FromStringAndSize
|
||||
#define PyString_Check PyUnicode_Check
|
||||
#define PyString_InternFromString PyUnicode_InternFromString
|
||||
#define PyInt_FromLong PyLong_FromLong
|
||||
#define PyInt_FromSize_t PyLong_FromSize_t
|
||||
#if PY_VERSION_HEX < 0x03030000
|
||||
#error "Python 3.0 - 3.2 are not supported."
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob)? \
|
||||
((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
||||
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob) ? ((*(charpp) = const_cast<char*>( \
|
||||
PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL \
|
||||
? -1 \
|
||||
: 0) \
|
||||
: PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -70,10 +66,10 @@ namespace python {
|
||||
// released.
|
||||
// This is enough to support the "is" operator on live objects.
|
||||
// All descriptors are stored here.
|
||||
hash_map<const void*, PyObject*> interned_descriptors;
|
||||
std::unordered_map<const void*, PyObject*>* interned_descriptors;
|
||||
|
||||
PyObject* PyString_FromCppString(const string& str) {
|
||||
return PyString_FromStringAndSize(str.c_str(), str.size());
|
||||
PyObject* PyString_FromCppString(const std::string& str) {
|
||||
return PyUnicode_FromStringAndSize(str.c_str(), str.size());
|
||||
}
|
||||
|
||||
// Check that the calling Python code is the global scope of a _pb2.py module.
|
||||
@@ -119,8 +115,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.
|
||||
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) {
|
||||
@@ -131,7 +129,7 @@ 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;
|
||||
@@ -184,6 +182,21 @@ const FileDescriptor* GetFileDescriptor(const MethodDescriptor* descriptor) {
|
||||
return descriptor->service()->file();
|
||||
}
|
||||
|
||||
bool Reparse(
|
||||
PyMessageFactory* message_factory, const Message& from, Message* to) {
|
||||
// Reparse message.
|
||||
std::string serialized;
|
||||
from.SerializeToString(&serialized);
|
||||
io::CodedInputStream input(
|
||||
reinterpret_cast<const uint8_t*>(serialized.c_str()), serialized.size());
|
||||
input.SetExtensionRegistry(message_factory->pool->pool,
|
||||
message_factory->message_factory);
|
||||
bool success = to->ParseFromCodedStream(&input);
|
||||
if (!success) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// Converts options into a Python protobuf, and cache the result.
|
||||
//
|
||||
// This is a bit tricky because options can contain extension fields defined in
|
||||
@@ -197,7 +210,7 @@ static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) {
|
||||
// First search in the cache.
|
||||
PyDescriptorPool* caching_pool = GetDescriptorPool_FromPool(
|
||||
GetFileDescriptor(descriptor)->pool());
|
||||
hash_map<const void*, PyObject*>* descriptor_options =
|
||||
std::unordered_map<const void*, PyObject*>* descriptor_options =
|
||||
caching_pool->descriptor_options;
|
||||
if (descriptor_options->find(descriptor) != descriptor_options->end()) {
|
||||
PyObject *value = (*descriptor_options)[descriptor];
|
||||
@@ -227,12 +240,14 @@ static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) {
|
||||
message_type->full_name().c_str());
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr args(PyTuple_New(0));
|
||||
ScopedPyObjectPtr value(
|
||||
PyEval_CallObject(message_class->AsPyObject(), NULL));
|
||||
PyObject_Call(message_class->AsPyObject(), args.get(), NULL));
|
||||
Py_DECREF(message_class);
|
||||
if (value == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
if (!PyObject_TypeCheck(value.get(), &CMessage_Type)) {
|
||||
if (!PyObject_TypeCheck(value.get(), CMessage_Type)) {
|
||||
PyErr_Format(PyExc_TypeError, "Invalid class for %s: %s",
|
||||
message_type->full_name().c_str(),
|
||||
Py_TYPE(value.get())->tp_name);
|
||||
@@ -246,15 +261,8 @@ static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) {
|
||||
cmsg->message->CopyFrom(options);
|
||||
} else {
|
||||
// Reparse options string! XXX call cmessage::MergeFromString
|
||||
string serialized;
|
||||
options.SerializeToString(&serialized);
|
||||
io::CodedInputStream input(
|
||||
reinterpret_cast<const uint8*>(serialized.c_str()), serialized.size());
|
||||
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");
|
||||
if (!Reparse(message_factory, options, cmsg->message)) {
|
||||
PyErr_Format(PyExc_ValueError, "Error reparsing Options message");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
@@ -275,7 +283,7 @@ static PyObject* CopyToPythonProto(const DescriptorClass *descriptor,
|
||||
const Descriptor* self_descriptor =
|
||||
DescriptorProtoClass::default_instance().GetDescriptor();
|
||||
CMessage* message = reinterpret_cast<CMessage*>(target);
|
||||
if (!PyObject_TypeCheck(target, &CMessage_Type) ||
|
||||
if (!PyObject_TypeCheck(target, CMessage_Type) ||
|
||||
message->message->GetDescriptor() != self_descriptor) {
|
||||
PyErr_Format(PyExc_TypeError, "Not a %s message",
|
||||
self_descriptor->full_name().c_str());
|
||||
@@ -285,6 +293,16 @@ static PyObject* CopyToPythonProto(const DescriptorClass *descriptor,
|
||||
DescriptorProtoClass* descriptor_message =
|
||||
static_cast<DescriptorProtoClass*>(message->message);
|
||||
descriptor->CopyTo(descriptor_message);
|
||||
// Custom options might in unknown extensions. Reparse
|
||||
// the descriptor_message. Can't skip reparse when options unknown
|
||||
// fields is empty, because they might in sub descriptors' options.
|
||||
PyMessageFactory* message_factory =
|
||||
GetDefaultDescriptorPool()->py_message_factory;
|
||||
if (!Reparse(message_factory, *descriptor_message, descriptor_message)) {
|
||||
PyErr_Format(PyExc_ValueError, "Error reparsing descriptor message");
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -332,15 +350,15 @@ PyObject* NewInternedDescriptor(PyTypeObject* type,
|
||||
}
|
||||
|
||||
// See if the object is in the map of interned descriptors
|
||||
hash_map<const void*, PyObject*>::iterator it =
|
||||
interned_descriptors.find(descriptor);
|
||||
if (it != interned_descriptors.end()) {
|
||||
std::unordered_map<const void*, PyObject*>::iterator it =
|
||||
interned_descriptors->find(descriptor);
|
||||
if (it != interned_descriptors->end()) {
|
||||
GOOGLE_DCHECK(Py_TYPE(it->second) == type);
|
||||
Py_INCREF(it->second);
|
||||
return it->second;
|
||||
}
|
||||
// Create a new descriptor object
|
||||
PyBaseDescriptor* py_descriptor = PyObject_New(
|
||||
PyBaseDescriptor* py_descriptor = PyObject_GC_New(
|
||||
PyBaseDescriptor, type);
|
||||
if (py_descriptor == NULL) {
|
||||
return NULL;
|
||||
@@ -348,7 +366,7 @@ PyObject* NewInternedDescriptor(PyTypeObject* type,
|
||||
py_descriptor->descriptor = descriptor;
|
||||
|
||||
// and cache it.
|
||||
interned_descriptors.insert(
|
||||
interned_descriptors->insert(
|
||||
std::make_pair(descriptor, reinterpret_cast<PyObject*>(py_descriptor)));
|
||||
|
||||
// Ensures that the DescriptorPool stays alive.
|
||||
@@ -362,17 +380,32 @@ PyObject* NewInternedDescriptor(PyTypeObject* type,
|
||||
Py_INCREF(pool);
|
||||
py_descriptor->pool = pool;
|
||||
|
||||
PyObject_GC_Track(py_descriptor);
|
||||
|
||||
if (was_created) {
|
||||
*was_created = true;
|
||||
}
|
||||
return reinterpret_cast<PyObject*>(py_descriptor);
|
||||
}
|
||||
|
||||
static void Dealloc(PyBaseDescriptor* self) {
|
||||
static void Dealloc(PyObject* pself) {
|
||||
PyBaseDescriptor* self = reinterpret_cast<PyBaseDescriptor*>(pself);
|
||||
// Remove from interned dictionary
|
||||
interned_descriptors.erase(self->descriptor);
|
||||
interned_descriptors->erase(self->descriptor);
|
||||
Py_CLEAR(self->pool);
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
Py_TYPE(self)->tp_free(pself);
|
||||
}
|
||||
|
||||
static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
|
||||
PyBaseDescriptor* self = reinterpret_cast<PyBaseDescriptor*>(pself);
|
||||
Py_VISIT(self->pool);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int GcClear(PyObject* pself) {
|
||||
PyBaseDescriptor* self = reinterpret_cast<PyBaseDescriptor*>(pself);
|
||||
Py_CLEAR(self->pool);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyGetSetDef Getters[] = {
|
||||
@@ -380,36 +413,36 @@ static PyGetSetDef Getters[] = {
|
||||
};
|
||||
|
||||
PyTypeObject PyBaseDescriptor_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
FULL_MODULE_NAME ".DescriptorBase", // tp_name
|
||||
sizeof(PyBaseDescriptor), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"Descriptors base class", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
0, // tp_methods
|
||||
0, // tp_members
|
||||
Getters, // tp_getset
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
|
||||
".DescriptorBase", // tp_name
|
||||
sizeof(PyBaseDescriptor), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
|
||||
"Descriptors base class", // tp_doc
|
||||
GcTraverse, // tp_traverse
|
||||
GcClear, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
0, // tp_methods
|
||||
0, // tp_members
|
||||
Getters, // tp_getset
|
||||
};
|
||||
|
||||
} // namespace descriptor
|
||||
@@ -442,7 +475,7 @@ static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
|
||||
}
|
||||
|
||||
static PyObject* GetConcreteClass(PyBaseDescriptor* self, void *closure) {
|
||||
// Retuns the canonical class for the given descriptor.
|
||||
// Returns the canonical class for the given descriptor.
|
||||
// This is the class that was registered with the primary descriptor pool
|
||||
// which contains this descriptor.
|
||||
// This might not be the one you expect! For example the returned object does
|
||||
@@ -522,8 +555,8 @@ static PyObject* GetExtensionRanges(PyBaseDescriptor *self, void *closure) {
|
||||
|
||||
for (int i = 0; i < descriptor->extension_range_count(); i++) {
|
||||
const Descriptor::ExtensionRange* range = descriptor->extension_range(i);
|
||||
PyObject* start = PyInt_FromLong(range->start);
|
||||
PyObject* end = PyInt_FromLong(range->end);
|
||||
PyObject* start = PyLong_FromLong(range->start);
|
||||
PyObject* end = PyLong_FromLong(range->end);
|
||||
PyList_SetItem(range_list, i, PyTuple_Pack(2, start, end));
|
||||
}
|
||||
|
||||
@@ -597,7 +630,7 @@ static PyObject* EnumValueName(PyBaseDescriptor *self, PyObject *args) {
|
||||
}
|
||||
|
||||
static PyObject* GetSyntax(PyBaseDescriptor *self, void *closure) {
|
||||
return PyString_InternFromString(
|
||||
return PyUnicode_InternFromString(
|
||||
FileDescriptor::SyntaxName(_GetDescriptor(self)->file()->syntax()));
|
||||
}
|
||||
|
||||
@@ -724,23 +757,23 @@ static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
|
||||
}
|
||||
|
||||
static PyObject* GetType(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->type());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->type());
|
||||
}
|
||||
|
||||
static PyObject* GetCppType(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->cpp_type());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->cpp_type());
|
||||
}
|
||||
|
||||
static PyObject* GetLabel(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->label());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->label());
|
||||
}
|
||||
|
||||
static PyObject* GetNumber(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->number());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->number());
|
||||
}
|
||||
|
||||
static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->index());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->index());
|
||||
}
|
||||
|
||||
static PyObject* GetID(PyBaseDescriptor *self, void *closure) {
|
||||
@@ -758,24 +791,29 @@ static PyObject* HasDefaultValue(PyBaseDescriptor *self, void *closure) {
|
||||
static PyObject* GetDefaultValue(PyBaseDescriptor *self, void *closure) {
|
||||
PyObject *result;
|
||||
|
||||
if (_GetDescriptor(self)->is_repeated()) {
|
||||
return PyList_New(0);
|
||||
}
|
||||
|
||||
|
||||
switch (_GetDescriptor(self)->cpp_type()) {
|
||||
case FieldDescriptor::CPPTYPE_INT32: {
|
||||
int32 value = _GetDescriptor(self)->default_value_int32();
|
||||
result = PyInt_FromLong(value);
|
||||
int32_t value = _GetDescriptor(self)->default_value_int32();
|
||||
result = PyLong_FromLong(value);
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_INT64: {
|
||||
int64 value = _GetDescriptor(self)->default_value_int64();
|
||||
int64_t value = _GetDescriptor(self)->default_value_int64();
|
||||
result = PyLong_FromLongLong(value);
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_UINT32: {
|
||||
uint32 value = _GetDescriptor(self)->default_value_uint32();
|
||||
result = PyInt_FromSize_t(value);
|
||||
uint32_t value = _GetDescriptor(self)->default_value_uint32();
|
||||
result = PyLong_FromSsize_t(value);
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_UINT64: {
|
||||
uint64 value = _GetDescriptor(self)->default_value_uint64();
|
||||
uint64_t value = _GetDescriptor(self)->default_value_uint64();
|
||||
result = PyLong_FromUnsignedLongLong(value);
|
||||
break;
|
||||
}
|
||||
@@ -795,14 +833,18 @@ static PyObject* GetDefaultValue(PyBaseDescriptor *self, void *closure) {
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_STRING: {
|
||||
const string& value = _GetDescriptor(self)->default_value_string();
|
||||
const std::string& value = _GetDescriptor(self)->default_value_string();
|
||||
result = ToStringObject(_GetDescriptor(self), value);
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_ENUM: {
|
||||
const EnumValueDescriptor* value =
|
||||
_GetDescriptor(self)->default_value_enum();
|
||||
result = PyInt_FromLong(value->number());
|
||||
result = PyLong_FromLong(value->number());
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_MESSAGE: {
|
||||
Py_RETURN_NONE;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -861,8 +903,9 @@ static int SetContainingType(PyBaseDescriptor *self, PyObject *value,
|
||||
}
|
||||
|
||||
static PyObject* GetExtensionScope(PyBaseDescriptor *self, void *closure) {
|
||||
const auto* desc = _GetDescriptor(self);
|
||||
const Descriptor* extension_scope =
|
||||
_GetDescriptor(self)->extension_scope();
|
||||
desc->is_extension() ? desc->extension_scope() : nullptr;
|
||||
if (extension_scope) {
|
||||
return PyMessageDescriptor_FromDescriptor(extension_scope);
|
||||
} else {
|
||||
@@ -1169,11 +1212,11 @@ static PyObject* GetName(PyBaseDescriptor *self, void *closure) {
|
||||
}
|
||||
|
||||
static PyObject* GetNumber(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->number());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->number());
|
||||
}
|
||||
|
||||
static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->index());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->index());
|
||||
}
|
||||
|
||||
static PyObject* GetType(PyBaseDescriptor *self, void *closure) {
|
||||
@@ -1276,7 +1319,7 @@ static const FileDescriptor* _GetDescriptor(PyFileDescriptor *self) {
|
||||
|
||||
static void Dealloc(PyFileDescriptor* self) {
|
||||
Py_XDECREF(self->serialized_pb);
|
||||
descriptor::Dealloc(&self->base);
|
||||
descriptor::Dealloc(reinterpret_cast<PyObject*>(self));
|
||||
}
|
||||
|
||||
static PyObject* GetPool(PyFileDescriptor *self, void *closure) {
|
||||
@@ -1302,7 +1345,7 @@ static PyObject* GetSerializedPb(PyFileDescriptor *self, void *closure) {
|
||||
}
|
||||
FileDescriptorProto file_proto;
|
||||
_GetDescriptor(self)->CopyTo(&file_proto);
|
||||
string contents;
|
||||
std::string contents;
|
||||
file_proto.SerializePartialToString(&contents);
|
||||
self->serialized_pb = PyBytes_FromStringAndSize(
|
||||
contents.c_str(), contents.size());
|
||||
@@ -1365,7 +1408,7 @@ static int SetSerializedOptions(PyFileDescriptor *self, PyObject *value,
|
||||
}
|
||||
|
||||
static PyObject* GetSyntax(PyFileDescriptor *self, void *closure) {
|
||||
return PyString_InternFromString(
|
||||
return PyUnicode_InternFromString(
|
||||
FileDescriptor::SyntaxName(_GetDescriptor(self)->syntax()));
|
||||
}
|
||||
|
||||
@@ -1404,45 +1447,45 @@ static PyMethodDef Methods[] = {
|
||||
} // namespace file_descriptor
|
||||
|
||||
PyTypeObject PyFileDescriptor_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
FULL_MODULE_NAME ".FileDescriptor", // tp_name
|
||||
sizeof(PyFileDescriptor), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)file_descriptor::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"A File Descriptor", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
file_descriptor::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
file_descriptor::Getters, // tp_getset
|
||||
&descriptor::PyBaseDescriptor_Type, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
0, // tp_new
|
||||
PyObject_Del, // tp_free
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
|
||||
".FileDescriptor", // tp_name
|
||||
sizeof(PyFileDescriptor), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)file_descriptor::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"A File Descriptor", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
file_descriptor::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
file_descriptor::Getters, // tp_getset
|
||||
&descriptor::PyBaseDescriptor_Type, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
0, // tp_new
|
||||
PyObject_GC_Del, // tp_free
|
||||
};
|
||||
|
||||
PyObject* PyFileDescriptor_FromDescriptor(
|
||||
@@ -1497,7 +1540,7 @@ static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
|
||||
}
|
||||
|
||||
static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->index());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->index());
|
||||
}
|
||||
|
||||
static PyObject* GetFields(PyBaseDescriptor* self, void *closure) {
|
||||
@@ -1623,7 +1666,7 @@ static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
|
||||
}
|
||||
|
||||
static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->index());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->index());
|
||||
}
|
||||
|
||||
static PyObject* GetMethods(PyBaseDescriptor* self, void *closure) {
|
||||
@@ -1642,7 +1685,7 @@ static PyObject* FindMethodByName(PyBaseDescriptor *self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const MethodDescriptor* method_descriptor =
|
||||
_GetDescriptor(self)->FindMethodByName(string(name, name_size));
|
||||
_GetDescriptor(self)->FindMethodByName(StringParam(name, name_size));
|
||||
if (method_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
|
||||
return NULL;
|
||||
@@ -1746,7 +1789,7 @@ static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
|
||||
}
|
||||
|
||||
static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
|
||||
return PyInt_FromLong(_GetDescriptor(self)->index());
|
||||
return PyLong_FromLong(_GetDescriptor(self)->index());
|
||||
}
|
||||
|
||||
static PyObject* GetContainingService(PyBaseDescriptor *self, void *closure) {
|
||||
@@ -1832,21 +1875,12 @@ PyObject* PyMethodDescriptor_FromDescriptor(
|
||||
&PyMethodDescriptor_Type, method_descriptor, NULL);
|
||||
}
|
||||
|
||||
const MethodDescriptor* PyMethodDescriptor_AsDescriptor(PyObject* obj) {
|
||||
if (!PyObject_TypeCheck(obj, &PyMethodDescriptor_Type)) {
|
||||
PyErr_SetString(PyExc_TypeError, "Not a MethodDescriptor");
|
||||
return NULL;
|
||||
}
|
||||
return reinterpret_cast<const MethodDescriptor*>(
|
||||
reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor);
|
||||
}
|
||||
|
||||
// Add a enum values to a type dictionary.
|
||||
static bool AddEnumValues(PyTypeObject *type,
|
||||
const EnumDescriptor* enum_descriptor) {
|
||||
for (int i = 0; i < enum_descriptor->value_count(); ++i) {
|
||||
const EnumValueDescriptor* value = enum_descriptor->value(i);
|
||||
ScopedPyObjectPtr obj(PyInt_FromLong(value->number()));
|
||||
ScopedPyObjectPtr obj(PyLong_FromLong(value->number()));
|
||||
if (obj == NULL) {
|
||||
return false;
|
||||
}
|
||||
@@ -1859,7 +1893,7 @@ static bool AddEnumValues(PyTypeObject *type,
|
||||
}
|
||||
|
||||
static bool AddIntConstant(PyTypeObject *type, const char* name, int value) {
|
||||
ScopedPyObjectPtr obj(PyInt_FromLong(value));
|
||||
ScopedPyObjectPtr obj(PyLong_FromLong(value));
|
||||
if (PyDict_SetItemString(type->tp_dict, name, obj.get()) < 0) {
|
||||
return false;
|
||||
}
|
||||
@@ -1919,6 +1953,9 @@ bool InitDescriptor() {
|
||||
if (!InitDescriptorMappingTypes())
|
||||
return false;
|
||||
|
||||
// Initialize globals defined in this file.
|
||||
interned_descriptors = new std::unordered_map<const void*, PyObject*>;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -41,6 +41,9 @@ namespace google {
|
||||
namespace protobuf {
|
||||
namespace python {
|
||||
|
||||
// Should match the type of ConstStringParam.
|
||||
using StringParam = std::string;
|
||||
|
||||
extern PyTypeObject PyMessageDescriptor_Type;
|
||||
extern PyTypeObject PyFieldDescriptor_Type;
|
||||
extern PyTypeObject PyEnumDescriptor_Type;
|
||||
@@ -81,7 +84,6 @@ const FieldDescriptor* PyFieldDescriptor_AsDescriptor(PyObject* obj);
|
||||
const EnumDescriptor* PyEnumDescriptor_AsDescriptor(PyObject* obj);
|
||||
const FileDescriptor* PyFileDescriptor_AsDescriptor(PyObject* obj);
|
||||
const ServiceDescriptor* PyServiceDescriptor_AsDescriptor(PyObject* obj);
|
||||
const MethodDescriptor* PyMethodDescriptor_AsDescriptor(PyObject* obj);
|
||||
|
||||
// Returns the raw C++ pointer.
|
||||
const void* PyDescriptor_AsVoidPtr(PyObject* obj);
|
||||
@@ -100,6 +102,6 @@ bool InitDescriptor();
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
|
||||
@@ -33,7 +33,7 @@
|
||||
//
|
||||
// They avoid the allocation of a full dictionary or a full list: they simply
|
||||
// store a pointer to the parent descriptor, use the C++ Descriptor methods (see
|
||||
// google/protobuf/descriptor.h) to retrieve other descriptors, and create
|
||||
// net/proto2/public/descriptor.h) to retrieve other descriptors, and create
|
||||
// Python objects on the fly.
|
||||
//
|
||||
// The containers fully conform to abc.Mapping and abc.Sequence, and behave just
|
||||
@@ -57,18 +57,12 @@
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#define PyString_FromStringAndSize PyUnicode_FromStringAndSize
|
||||
#define PyString_FromFormat PyUnicode_FromFormat
|
||||
#define PyInt_FromLong PyLong_FromLong
|
||||
#if PY_VERSION_HEX < 0x03030000
|
||||
#error "Python 3.0 - 3.2 are not supported."
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob)? \
|
||||
((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
||||
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob) ? ((*(charpp) = const_cast<char*>( \
|
||||
PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL \
|
||||
? -1 \
|
||||
: 0) \
|
||||
: PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -78,13 +72,15 @@ struct PyContainer;
|
||||
|
||||
typedef int (*CountMethod)(PyContainer* self);
|
||||
typedef const void* (*GetByIndexMethod)(PyContainer* self, int index);
|
||||
typedef const void* (*GetByNameMethod)(PyContainer* self, const string& name);
|
||||
typedef const void* (*GetByNameMethod)(PyContainer* self,
|
||||
ConstStringParam name);
|
||||
typedef const void* (*GetByCamelcaseNameMethod)(PyContainer* self,
|
||||
const string& name);
|
||||
ConstStringParam name);
|
||||
typedef const void* (*GetByNumberMethod)(PyContainer* self, int index);
|
||||
typedef PyObject* (*NewObjectFromItemMethod)(const void* descriptor);
|
||||
typedef const string& (*GetItemNameMethod)(const void* descriptor);
|
||||
typedef const string& (*GetItemCamelcaseNameMethod)(const void* descriptor);
|
||||
typedef const std::string& (*GetItemNameMethod)(const void* descriptor);
|
||||
typedef const std::string& (*GetItemCamelcaseNameMethod)(
|
||||
const void* descriptor);
|
||||
typedef int (*GetItemNumberMethod)(const void* descriptor);
|
||||
typedef int (*GetItemIndexMethod)(const void* descriptor);
|
||||
|
||||
@@ -179,7 +175,7 @@ static bool _GetItemByKey(PyContainer* self, PyObject* key, const void** item) {
|
||||
return false;
|
||||
}
|
||||
*item = self->container_def->get_by_name_fn(
|
||||
self, string(name, name_size));
|
||||
self, StringParam(name, name_size));
|
||||
return true;
|
||||
}
|
||||
case PyContainer::KIND_BYCAMELCASENAME:
|
||||
@@ -196,7 +192,7 @@ static bool _GetItemByKey(PyContainer* self, PyObject* key, const void** item) {
|
||||
return false;
|
||||
}
|
||||
*item = self->container_def->get_by_camelcase_name_fn(
|
||||
self, string(camelcase_name, name_size));
|
||||
self, StringParam(camelcase_name, name_size));
|
||||
return true;
|
||||
}
|
||||
case PyContainer::KIND_BYNUMBER:
|
||||
@@ -227,19 +223,19 @@ static PyObject* _NewKey_ByIndex(PyContainer* self, Py_ssize_t index) {
|
||||
switch (self->kind) {
|
||||
case PyContainer::KIND_BYNAME:
|
||||
{
|
||||
const string& name(self->container_def->get_item_name_fn(item));
|
||||
return PyString_FromStringAndSize(name.c_str(), name.size());
|
||||
const std::string& name(self->container_def->get_item_name_fn(item));
|
||||
return PyUnicode_FromStringAndSize(name.c_str(), name.size());
|
||||
}
|
||||
case PyContainer::KIND_BYCAMELCASENAME:
|
||||
{
|
||||
const string& name(
|
||||
self->container_def->get_item_camelcase_name_fn(item));
|
||||
return PyString_FromStringAndSize(name.c_str(), name.size());
|
||||
const std::string& name(
|
||||
self->container_def->get_item_camelcase_name_fn(item));
|
||||
return PyUnicode_FromStringAndSize(name.c_str(), name.size());
|
||||
}
|
||||
case PyContainer::KIND_BYNUMBER:
|
||||
{
|
||||
int value = self->container_def->get_item_number_fn(item);
|
||||
return PyInt_FromLong(value);
|
||||
return PyLong_FromLong(value);
|
||||
}
|
||||
default:
|
||||
PyErr_SetNone(PyExc_NotImplementedError);
|
||||
@@ -316,8 +312,8 @@ static PyObject* ContainerRepr(PyContainer* self) {
|
||||
kind = "mapping by number";
|
||||
break;
|
||||
}
|
||||
return PyString_FromFormat(
|
||||
"<%s %s>", self->container_def->mapping_name, kind);
|
||||
return PyUnicode_FromFormat("<%s %s>", self->container_def->mapping_name,
|
||||
kind);
|
||||
}
|
||||
|
||||
extern PyTypeObject DescriptorMapping_Type;
|
||||
@@ -637,6 +633,7 @@ int Find(PyContainer* self, PyObject* item) {
|
||||
// the .proto file definition.
|
||||
const void* descriptor_ptr = PyDescriptor_AsVoidPtr(item);
|
||||
if (descriptor_ptr == NULL) {
|
||||
PyErr_Clear();
|
||||
// Not a descriptor, it cannot be in the list.
|
||||
return -1;
|
||||
}
|
||||
@@ -673,7 +670,7 @@ static PyObject* Index(PyContainer* self, PyObject* item) {
|
||||
PyErr_SetNone(PyExc_ValueError);
|
||||
return NULL;
|
||||
} else {
|
||||
return PyInt_FromLong(position);
|
||||
return PyLong_FromLong(position);
|
||||
}
|
||||
}
|
||||
// Implements "list.__contains__()": is the object in the sequence.
|
||||
@@ -691,9 +688,9 @@ static int SeqContains(PyContainer* self, PyObject* item) {
|
||||
static PyObject* Count(PyContainer* self, PyObject* item) {
|
||||
int position = Find(self, item);
|
||||
if (position < 0) {
|
||||
return PyInt_FromLong(0);
|
||||
return PyLong_FromLong(0);
|
||||
} else {
|
||||
return PyInt_FromLong(1);
|
||||
return PyLong_FromLong(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -957,12 +954,12 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->field_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindFieldByName(name);
|
||||
}
|
||||
|
||||
static const void* GetByCamelcaseName(PyContainer* self,
|
||||
const string& name) {
|
||||
ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindFieldByCamelcaseName(name);
|
||||
}
|
||||
|
||||
@@ -978,11 +975,11 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
static const string& GetItemCamelcaseName(const void* item) {
|
||||
static const std::string& GetItemCamelcaseName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->camelcase_name();
|
||||
}
|
||||
|
||||
@@ -1035,7 +1032,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->nested_type_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindNestedTypeByName(name);
|
||||
}
|
||||
|
||||
@@ -1047,7 +1044,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyMessageDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1087,7 +1084,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->enum_type_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindEnumTypeByName(name);
|
||||
}
|
||||
|
||||
@@ -1099,7 +1096,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyEnumDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1150,7 +1147,7 @@ static int Count(PyContainer* self) {
|
||||
return count;
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindEnumValueByName(name);
|
||||
}
|
||||
|
||||
@@ -1178,7 +1175,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1210,7 +1207,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->extension_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindExtensionByName(name);
|
||||
}
|
||||
|
||||
@@ -1222,7 +1219,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1262,7 +1259,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->oneof_decl_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindOneofByName(name);
|
||||
}
|
||||
|
||||
@@ -1274,7 +1271,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyOneofDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1328,7 +1325,7 @@ static const void* GetByIndex(PyContainer* self, int index) {
|
||||
return GetDescriptor(self)->value(index);
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindValueByName(name);
|
||||
}
|
||||
|
||||
@@ -1341,7 +1338,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1449,7 +1446,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->method_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindMethodByName(name);
|
||||
}
|
||||
|
||||
@@ -1461,7 +1458,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyMethodDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1511,7 +1508,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->message_type_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindMessageTypeByName(name);
|
||||
}
|
||||
|
||||
@@ -1523,7 +1520,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyMessageDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1559,7 +1556,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->enum_type_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindEnumTypeByName(name);
|
||||
}
|
||||
|
||||
@@ -1571,7 +1568,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyEnumDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1607,7 +1604,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->extension_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindExtensionByName(name);
|
||||
}
|
||||
|
||||
@@ -1619,7 +1616,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
@@ -1655,7 +1652,7 @@ static int Count(PyContainer* self) {
|
||||
return GetDescriptor(self)->service_count();
|
||||
}
|
||||
|
||||
static const void* GetByName(PyContainer* self, const string& name) {
|
||||
static const void* GetByName(PyContainer* self, ConstStringParam name) {
|
||||
return GetDescriptor(self)->FindServiceByName(name);
|
||||
}
|
||||
|
||||
@@ -1667,7 +1664,7 @@ static PyObject* NewObjectFromItem(const void* item) {
|
||||
return PyServiceDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
|
||||
}
|
||||
|
||||
static const string& GetItemName(const void* item) {
|
||||
static const std::string& GetItemName(const void* item) {
|
||||
return static_cast<ItemDescriptor>(item)->name();
|
||||
}
|
||||
|
||||
|
||||
@@ -104,6 +104,6 @@ PyObject* NewServiceMethodsByName(const ServiceDescriptor* descriptor);
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
|
||||
@@ -33,6 +33,8 @@
|
||||
|
||||
#include <google/protobuf/pyext/descriptor_database.h>
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
@@ -70,7 +72,7 @@ static bool GetFileDescriptorProto(PyObject* py_descriptor,
|
||||
const Descriptor* filedescriptor_descriptor =
|
||||
FileDescriptorProto::default_instance().GetDescriptor();
|
||||
CMessage* message = reinterpret_cast<CMessage*>(py_descriptor);
|
||||
if (PyObject_TypeCheck(py_descriptor, &CMessage_Type) &&
|
||||
if (PyObject_TypeCheck(py_descriptor, CMessage_Type) &&
|
||||
message->message->GetDescriptor() == filedescriptor_descriptor) {
|
||||
// Fast path: Just use the pointer.
|
||||
FileDescriptorProto* file_proto =
|
||||
@@ -108,7 +110,7 @@ static bool GetFileDescriptorProto(PyObject* py_descriptor,
|
||||
}
|
||||
|
||||
// Find a file by file name.
|
||||
bool PyDescriptorDatabase::FindFileByName(const string& filename,
|
||||
bool PyDescriptorDatabase::FindFileByName(const std::string& filename,
|
||||
FileDescriptorProto* output) {
|
||||
ScopedPyObjectPtr py_descriptor(PyObject_CallMethod(
|
||||
py_database_, "FindFileByName", "s#", filename.c_str(), filename.size()));
|
||||
@@ -117,7 +119,7 @@ bool PyDescriptorDatabase::FindFileByName(const string& filename,
|
||||
|
||||
// Find the file that declares the given fully-qualified symbol name.
|
||||
bool PyDescriptorDatabase::FindFileContainingSymbol(
|
||||
const string& symbol_name, FileDescriptorProto* output) {
|
||||
const std::string& symbol_name, FileDescriptorProto* output) {
|
||||
ScopedPyObjectPtr py_descriptor(
|
||||
PyObject_CallMethod(py_database_, "FindFileContainingSymbol", "s#",
|
||||
symbol_name.c_str(), symbol_name.size()));
|
||||
@@ -128,7 +130,7 @@ bool PyDescriptorDatabase::FindFileContainingSymbol(
|
||||
// with the given field number.
|
||||
// Python DescriptorDatabases are not required to implement this method.
|
||||
bool PyDescriptorDatabase::FindFileContainingExtension(
|
||||
const string& containing_type, int field_number,
|
||||
const std::string& containing_type, int field_number,
|
||||
FileDescriptorProto* output) {
|
||||
ScopedPyObjectPtr py_method(
|
||||
PyObject_GetAttrString(py_database_, "FindFileContainingExtension"));
|
||||
@@ -143,6 +145,43 @@ bool PyDescriptorDatabase::FindFileContainingExtension(
|
||||
return GetFileDescriptorProto(py_descriptor.get(), output);
|
||||
}
|
||||
|
||||
// Finds the tag numbers used by all known extensions of
|
||||
// containing_type, and appends them to output in an undefined
|
||||
// order.
|
||||
// Python DescriptorDatabases are not required to implement this method.
|
||||
bool PyDescriptorDatabase::FindAllExtensionNumbers(
|
||||
const std::string& containing_type, std::vector<int>* output) {
|
||||
ScopedPyObjectPtr py_method(
|
||||
PyObject_GetAttrString(py_database_, "FindAllExtensionNumbers"));
|
||||
if (py_method == NULL) {
|
||||
// This method is not implemented, returns without error.
|
||||
PyErr_Clear();
|
||||
return false;
|
||||
}
|
||||
ScopedPyObjectPtr py_list(
|
||||
PyObject_CallFunction(py_method.get(), "s#", containing_type.c_str(),
|
||||
containing_type.size()));
|
||||
if (py_list == NULL) {
|
||||
PyErr_Print();
|
||||
return false;
|
||||
}
|
||||
Py_ssize_t size = PyList_Size(py_list.get());
|
||||
int64_t item_value;
|
||||
for (Py_ssize_t i = 0 ; i < size; ++i) {
|
||||
ScopedPyObjectPtr item(PySequence_GetItem(py_list.get(), i));
|
||||
item_value = PyLong_AsLong(item.get());
|
||||
if (item_value < 0) {
|
||||
GOOGLE_LOG(ERROR)
|
||||
<< "FindAllExtensionNumbers method did not return "
|
||||
<< "valid extension numbers.";
|
||||
PyErr_Print();
|
||||
return false;
|
||||
}
|
||||
output->push_back(item_value);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
@@ -48,21 +48,27 @@ class PyDescriptorDatabase : public DescriptorDatabase {
|
||||
// with a copy of FileDescriptorProto.
|
||||
|
||||
// Find a file by file name.
|
||||
bool FindFileByName(const string& filename,
|
||||
FileDescriptorProto* output);
|
||||
bool FindFileByName(const std::string& filename, FileDescriptorProto* output);
|
||||
|
||||
// Find the file that declares the given fully-qualified symbol name.
|
||||
bool FindFileContainingSymbol(const string& symbol_name,
|
||||
bool FindFileContainingSymbol(const std::string& symbol_name,
|
||||
FileDescriptorProto* output);
|
||||
|
||||
// Find the file which defines an extension extending the given message type
|
||||
// with the given field number.
|
||||
// Containing_type must be a fully-qualified type name.
|
||||
// Python objects are not required to implement this method.
|
||||
bool FindFileContainingExtension(const string& containing_type,
|
||||
bool FindFileContainingExtension(const std::string& containing_type,
|
||||
int field_number,
|
||||
FileDescriptorProto* output);
|
||||
|
||||
// Finds the tag numbers used by all known extensions of
|
||||
// containing_type, and appends them to output in an undefined
|
||||
// order.
|
||||
// Python objects are not required to implement this method.
|
||||
bool FindAllExtensionNumbers(const std::string& containing_type,
|
||||
std::vector<int>* output);
|
||||
|
||||
private:
|
||||
// The python object that implements the database. The reference is owned.
|
||||
PyObject* py_database_;
|
||||
@@ -70,6 +76,6 @@ class PyDescriptorDatabase : public DescriptorDatabase {
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
|
||||
@@ -30,6 +30,8 @@
|
||||
|
||||
// Implements the DescriptorPool, which collects all descriptors.
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
@@ -41,16 +43,12 @@
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#define PyString_FromStringAndSize PyUnicode_FromStringAndSize
|
||||
#if PY_VERSION_HEX < 0x03030000
|
||||
#error "Python 3.0 - 3.2 are not supported."
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob)? \
|
||||
((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
||||
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob) ? ((*(charpp) = const_cast<char*>( \
|
||||
PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL \
|
||||
? -1 \
|
||||
: 0) \
|
||||
: PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -58,24 +56,59 @@ namespace python {
|
||||
|
||||
// A map to cache Python Pools per C++ pointer.
|
||||
// Pointers are not owned here, and belong to the PyDescriptorPool.
|
||||
static hash_map<const DescriptorPool*, PyDescriptorPool*> descriptor_pool_map;
|
||||
static std::unordered_map<const DescriptorPool*, PyDescriptorPool*>*
|
||||
descriptor_pool_map;
|
||||
|
||||
namespace cdescriptor_pool {
|
||||
|
||||
// Collects errors that occur during proto file building to allow them to be
|
||||
// propagated in the python exception instead of only living in ERROR logs.
|
||||
class BuildFileErrorCollector : public DescriptorPool::ErrorCollector {
|
||||
public:
|
||||
BuildFileErrorCollector() : error_message(""), had_errors_(false) {}
|
||||
|
||||
void AddError(const std::string& filename, const std::string& element_name,
|
||||
const Message* descriptor, ErrorLocation location,
|
||||
const std::string& message) override {
|
||||
// Replicates the logging behavior that happens in the C++ implementation
|
||||
// when an error collector is not passed in.
|
||||
if (!had_errors_) {
|
||||
error_message +=
|
||||
("Invalid proto descriptor for file \"" + filename + "\":\n");
|
||||
had_errors_ = true;
|
||||
}
|
||||
// As this only happens on failure and will result in the program not
|
||||
// running at all, no effort is made to optimize this string manipulation.
|
||||
error_message += (" " + element_name + ": " + message + "\n");
|
||||
}
|
||||
|
||||
void Clear() {
|
||||
had_errors_ = false;
|
||||
error_message = "";
|
||||
}
|
||||
|
||||
std::string error_message;
|
||||
|
||||
private:
|
||||
bool had_errors_;
|
||||
};
|
||||
|
||||
// Create a Python DescriptorPool object, but does not fill the "pool"
|
||||
// attribute.
|
||||
static PyDescriptorPool* _CreateDescriptorPool() {
|
||||
PyDescriptorPool* cpool = PyObject_New(
|
||||
PyDescriptorPool* cpool = PyObject_GC_New(
|
||||
PyDescriptorPool, &PyDescriptorPool_Type);
|
||||
if (cpool == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
cpool->error_collector = nullptr;
|
||||
cpool->underlay = NULL;
|
||||
cpool->database = NULL;
|
||||
cpool->is_owned = false;
|
||||
cpool->is_mutable = false;
|
||||
|
||||
cpool->descriptor_options =
|
||||
new hash_map<const void*, PyObject *>();
|
||||
cpool->descriptor_options = new std::unordered_map<const void*, PyObject*>();
|
||||
|
||||
cpool->py_message_factory = message_factory::NewMessageFactory(
|
||||
&PyMessageFactory_Type, cpool);
|
||||
@@ -84,6 +117,8 @@ static PyDescriptorPool* _CreateDescriptorPool() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PyObject_GC_Track(cpool);
|
||||
|
||||
return cpool;
|
||||
}
|
||||
|
||||
@@ -99,9 +134,11 @@ static PyDescriptorPool* PyDescriptorPool_NewWithUnderlay(
|
||||
return NULL;
|
||||
}
|
||||
cpool->pool = new DescriptorPool(underlay);
|
||||
cpool->is_owned = true;
|
||||
cpool->is_mutable = true;
|
||||
cpool->underlay = underlay;
|
||||
|
||||
if (!descriptor_pool_map.insert(
|
||||
if (!descriptor_pool_map->insert(
|
||||
std::make_pair(cpool->pool, cpool)).second) {
|
||||
// Should never happen -- would indicate an internal error / bug.
|
||||
PyErr_SetString(PyExc_ValueError, "DescriptorPool already registered");
|
||||
@@ -118,13 +155,17 @@ static PyDescriptorPool* PyDescriptorPool_NewWithDatabase(
|
||||
return NULL;
|
||||
}
|
||||
if (database != NULL) {
|
||||
cpool->pool = new DescriptorPool(database);
|
||||
cpool->error_collector = new BuildFileErrorCollector();
|
||||
cpool->pool = new DescriptorPool(database, cpool->error_collector);
|
||||
cpool->is_mutable = false;
|
||||
cpool->database = database;
|
||||
} else {
|
||||
cpool->pool = new DescriptorPool();
|
||||
cpool->is_mutable = true;
|
||||
}
|
||||
cpool->is_owned = true;
|
||||
|
||||
if (!descriptor_pool_map.insert(std::make_pair(cpool->pool, cpool)).second) {
|
||||
if (!descriptor_pool_map->insert(std::make_pair(cpool->pool, cpool)).second) {
|
||||
// Should never happen -- would indicate an internal error / bug.
|
||||
PyErr_SetString(PyExc_ValueError, "DescriptorPool already registered");
|
||||
return NULL;
|
||||
@@ -136,9 +177,10 @@ static PyDescriptorPool* PyDescriptorPool_NewWithDatabase(
|
||||
// The public DescriptorPool constructor.
|
||||
static PyObject* New(PyTypeObject* type,
|
||||
PyObject* args, PyObject* kwargs) {
|
||||
static char* kwlist[] = {"descriptor_db", 0};
|
||||
static const char* kwlist[] = {"descriptor_db", 0};
|
||||
PyObject* py_database = NULL;
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", kwlist, &py_database)) {
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O",
|
||||
const_cast<char**>(kwlist), &py_database)) {
|
||||
return NULL;
|
||||
}
|
||||
DescriptorDatabase* database = NULL;
|
||||
@@ -151,17 +193,46 @@ static PyObject* New(PyTypeObject* type,
|
||||
|
||||
static void Dealloc(PyObject* pself) {
|
||||
PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
|
||||
descriptor_pool_map.erase(self->pool);
|
||||
descriptor_pool_map->erase(self->pool);
|
||||
Py_CLEAR(self->py_message_factory);
|
||||
for (hash_map<const void*, PyObject*>::iterator it =
|
||||
for (std::unordered_map<const void*, PyObject*>::iterator it =
|
||||
self->descriptor_options->begin();
|
||||
it != self->descriptor_options->end(); ++it) {
|
||||
Py_DECREF(it->second);
|
||||
}
|
||||
delete self->descriptor_options;
|
||||
delete self->database;
|
||||
delete self->pool;
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
if (self->is_owned) {
|
||||
delete self->pool;
|
||||
}
|
||||
delete self->error_collector;
|
||||
Py_TYPE(self)->tp_free(pself);
|
||||
}
|
||||
|
||||
static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
|
||||
PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
|
||||
Py_VISIT(self->py_message_factory);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int GcClear(PyObject* pself) {
|
||||
PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
|
||||
Py_CLEAR(self->py_message_factory);
|
||||
return 0;
|
||||
}
|
||||
|
||||
PyObject* SetErrorFromCollector(DescriptorPool::ErrorCollector* self,
|
||||
const char* name, const char* error_type) {
|
||||
BuildFileErrorCollector* error_collector =
|
||||
reinterpret_cast<BuildFileErrorCollector*>(self);
|
||||
if (error_collector && !error_collector->error_message.empty()) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't build file for %s %.200s\n%s",
|
||||
error_type, name, error_collector->error_message.c_str());
|
||||
error_collector->Clear();
|
||||
return NULL;
|
||||
}
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find %s %.200s", error_type, name);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static PyObject* FindMessageByName(PyObject* self, PyObject* arg) {
|
||||
@@ -173,13 +244,15 @@ static PyObject* FindMessageByName(PyObject* self, PyObject* arg) {
|
||||
|
||||
const Descriptor* message_descriptor =
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMessageTypeByName(
|
||||
string(name, name_size));
|
||||
StringParam(name, name_size));
|
||||
|
||||
if (message_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find message %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
|
||||
"message");
|
||||
}
|
||||
|
||||
|
||||
return PyMessageDescriptor_FromDescriptor(message_descriptor);
|
||||
}
|
||||
|
||||
@@ -193,12 +266,12 @@ static PyObject* FindFileByName(PyObject* self, PyObject* arg) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PyDescriptorPool* py_pool = reinterpret_cast<PyDescriptorPool*>(self);
|
||||
const FileDescriptor* file_descriptor =
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileByName(
|
||||
string(name, name_size));
|
||||
py_pool->pool->FindFileByName(StringParam(name, name_size));
|
||||
|
||||
if (file_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find file %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(py_pool->error_collector, name, "file");
|
||||
}
|
||||
return PyFileDescriptor_FromDescriptor(file_descriptor);
|
||||
}
|
||||
@@ -211,13 +284,12 @@ PyObject* FindFieldByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const FieldDescriptor* field_descriptor =
|
||||
self->pool->FindFieldByName(string(name, name_size));
|
||||
self->pool->FindFieldByName(StringParam(name, name_size));
|
||||
if (field_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find field %.200s",
|
||||
name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(self->error_collector, name, "field");
|
||||
}
|
||||
|
||||
|
||||
return PyFieldDescriptor_FromDescriptor(field_descriptor);
|
||||
}
|
||||
|
||||
@@ -233,12 +305,13 @@ PyObject* FindExtensionByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const FieldDescriptor* field_descriptor =
|
||||
self->pool->FindExtensionByName(string(name, name_size));
|
||||
self->pool->FindExtensionByName(StringParam(name, name_size));
|
||||
if (field_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find extension field %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(self->error_collector, name,
|
||||
"extension field");
|
||||
}
|
||||
|
||||
|
||||
return PyFieldDescriptor_FromDescriptor(field_descriptor);
|
||||
}
|
||||
|
||||
@@ -254,12 +327,12 @@ PyObject* FindEnumTypeByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const EnumDescriptor* enum_descriptor =
|
||||
self->pool->FindEnumTypeByName(string(name, name_size));
|
||||
self->pool->FindEnumTypeByName(StringParam(name, name_size));
|
||||
if (enum_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find enum %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(self->error_collector, name, "enum");
|
||||
}
|
||||
|
||||
|
||||
return PyEnumDescriptor_FromDescriptor(enum_descriptor);
|
||||
}
|
||||
|
||||
@@ -275,12 +348,12 @@ PyObject* FindOneofByName(PyDescriptorPool* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
const OneofDescriptor* oneof_descriptor =
|
||||
self->pool->FindOneofByName(string(name, name_size));
|
||||
self->pool->FindOneofByName(StringParam(name, name_size));
|
||||
if (oneof_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find oneof %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(self->error_collector, name, "oneof");
|
||||
}
|
||||
|
||||
|
||||
return PyOneofDescriptor_FromDescriptor(oneof_descriptor);
|
||||
}
|
||||
|
||||
@@ -297,12 +370,14 @@ static PyObject* FindServiceByName(PyObject* self, PyObject* arg) {
|
||||
|
||||
const ServiceDescriptor* service_descriptor =
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindServiceByName(
|
||||
string(name, name_size));
|
||||
StringParam(name, name_size));
|
||||
if (service_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find service %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
|
||||
"service");
|
||||
}
|
||||
|
||||
|
||||
return PyServiceDescriptor_FromDescriptor(service_descriptor);
|
||||
}
|
||||
|
||||
@@ -315,12 +390,14 @@ static PyObject* FindMethodByName(PyObject* self, PyObject* arg) {
|
||||
|
||||
const MethodDescriptor* method_descriptor =
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMethodByName(
|
||||
string(name, name_size));
|
||||
StringParam(name, name_size));
|
||||
if (method_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
|
||||
"method");
|
||||
}
|
||||
|
||||
|
||||
return PyMethodDescriptor_FromDescriptor(method_descriptor);
|
||||
}
|
||||
|
||||
@@ -333,12 +410,14 @@ static PyObject* FindFileContainingSymbol(PyObject* self, PyObject* arg) {
|
||||
|
||||
const FileDescriptor* file_descriptor =
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileContainingSymbol(
|
||||
string(name, name_size));
|
||||
StringParam(name, name_size));
|
||||
if (file_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find symbol %.200s", name);
|
||||
return NULL;
|
||||
return SetErrorFromCollector(
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
|
||||
"symbol");
|
||||
}
|
||||
|
||||
|
||||
return PyFileDescriptor_FromDescriptor(file_descriptor);
|
||||
}
|
||||
|
||||
@@ -358,10 +437,20 @@ static PyObject* FindExtensionByNumber(PyObject* self, PyObject* args) {
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->pool->FindExtensionByNumber(
|
||||
descriptor, number);
|
||||
if (extension_descriptor == NULL) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find extension %d", number);
|
||||
BuildFileErrorCollector* error_collector =
|
||||
reinterpret_cast<BuildFileErrorCollector*>(
|
||||
reinterpret_cast<PyDescriptorPool*>(self)->error_collector);
|
||||
if (error_collector && !error_collector->error_message.empty()) {
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't build file for Extension %.d\n%s",
|
||||
number, error_collector->error_message.c_str());
|
||||
error_collector->Clear();
|
||||
return NULL;
|
||||
}
|
||||
PyErr_Format(PyExc_KeyError, "Couldn't find Extension %d", number);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
return PyFieldDescriptor_FromDescriptor(extension_descriptor);
|
||||
}
|
||||
|
||||
@@ -484,32 +573,6 @@ static PyObject* AddServiceDescriptor(PyObject* self, PyObject* descriptor) {
|
||||
}
|
||||
|
||||
// The code below loads new Descriptors from a serialized FileDescriptorProto.
|
||||
|
||||
// Collects errors that occur during proto file building to allow them to be
|
||||
// propagated in the python exception instead of only living in ERROR logs.
|
||||
class BuildFileErrorCollector : public DescriptorPool::ErrorCollector {
|
||||
public:
|
||||
BuildFileErrorCollector() : error_message(""), had_errors(false) {}
|
||||
|
||||
void AddError(const string& filename, const string& element_name,
|
||||
const Message* descriptor, ErrorLocation location,
|
||||
const string& message) {
|
||||
// Replicates the logging behavior that happens in the C++ implementation
|
||||
// when an error collector is not passed in.
|
||||
if (!had_errors) {
|
||||
error_message +=
|
||||
("Invalid proto descriptor for file \"" + filename + "\":\n");
|
||||
had_errors = true;
|
||||
}
|
||||
// As this only happens on failure and will result in the program not
|
||||
// running at all, no effort is made to optimize this string manipulation.
|
||||
error_message += (" " + element_name + ": " + message + "\n");
|
||||
}
|
||||
|
||||
string error_message;
|
||||
bool had_errors;
|
||||
};
|
||||
|
||||
static PyObject* AddSerializedFile(PyObject* pself, PyObject* serialized_pb) {
|
||||
PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
|
||||
char* message_type;
|
||||
@@ -522,6 +585,12 @@ static PyObject* AddSerializedFile(PyObject* pself, PyObject* serialized_pb) {
|
||||
"Add your file to the underlying database.");
|
||||
return NULL;
|
||||
}
|
||||
if (!self->is_mutable) {
|
||||
PyErr_SetString(
|
||||
PyExc_ValueError,
|
||||
"This DescriptorPool is not mutable and cannot add new definitions.");
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (PyBytes_AsStringAndSize(serialized_pb, &message_type, &message_len) < 0) {
|
||||
return NULL;
|
||||
@@ -546,8 +615,9 @@ static PyObject* AddSerializedFile(PyObject* pself, PyObject* serialized_pb) {
|
||||
|
||||
BuildFileErrorCollector error_collector;
|
||||
const FileDescriptor* descriptor =
|
||||
self->pool->BuildFileCollectingErrors(file_proto,
|
||||
&error_collector);
|
||||
// Pool is mutable, we can remove the "const".
|
||||
const_cast<DescriptorPool*>(self->pool)
|
||||
->BuildFileCollectingErrors(file_proto, &error_collector);
|
||||
if (descriptor == NULL) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"Couldn't build proto file into descriptor pool!\n%s",
|
||||
@@ -555,6 +625,7 @@ static PyObject* AddSerializedFile(PyObject* pself, PyObject* serialized_pb) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
return PyFileDescriptor_FromDescriptorWithSerializedPb(
|
||||
descriptor, serialized_pb);
|
||||
}
|
||||
@@ -616,45 +687,45 @@ static PyMethodDef Methods[] = {
|
||||
} // namespace cdescriptor_pool
|
||||
|
||||
PyTypeObject PyDescriptorPool_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
FULL_MODULE_NAME ".DescriptorPool", // tp_name
|
||||
sizeof(PyDescriptorPool), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
cdescriptor_pool::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"A Descriptor Pool", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
cdescriptor_pool::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
cdescriptor_pool::New, // tp_new
|
||||
PyObject_Del, // tp_free
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
|
||||
".DescriptorPool", // tp_name
|
||||
sizeof(PyDescriptorPool), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
cdescriptor_pool::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
|
||||
"A Descriptor Pool", // tp_doc
|
||||
cdescriptor_pool::GcTraverse, // tp_traverse
|
||||
cdescriptor_pool::GcClear, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
cdescriptor_pool::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
cdescriptor_pool::New, // tp_new
|
||||
PyObject_GC_Del, // tp_free
|
||||
};
|
||||
|
||||
// This is the DescriptorPool which contains all the definitions from the
|
||||
@@ -668,13 +739,17 @@ bool InitDescriptorPool() {
|
||||
// The Pool of messages declared in Python libraries.
|
||||
// generated_pool() contains all messages already linked in C++ libraries, and
|
||||
// is used as underlay.
|
||||
descriptor_pool_map =
|
||||
new std::unordered_map<const DescriptorPool*, PyDescriptorPool*>;
|
||||
python_generated_pool = cdescriptor_pool::PyDescriptorPool_NewWithUnderlay(
|
||||
DescriptorPool::generated_pool());
|
||||
if (python_generated_pool == NULL) {
|
||||
delete descriptor_pool_map;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Register this pool to be found for C++-generated descriptors.
|
||||
descriptor_pool_map.insert(
|
||||
descriptor_pool_map->insert(
|
||||
std::make_pair(DescriptorPool::generated_pool(),
|
||||
python_generated_pool));
|
||||
|
||||
@@ -695,15 +770,42 @@ PyDescriptorPool* GetDescriptorPool_FromPool(const DescriptorPool* pool) {
|
||||
pool == DescriptorPool::generated_pool()) {
|
||||
return python_generated_pool;
|
||||
}
|
||||
hash_map<const DescriptorPool*, PyDescriptorPool*>::iterator it =
|
||||
descriptor_pool_map.find(pool);
|
||||
if (it == descriptor_pool_map.end()) {
|
||||
std::unordered_map<const DescriptorPool*, PyDescriptorPool*>::iterator it =
|
||||
descriptor_pool_map->find(pool);
|
||||
if (it == descriptor_pool_map->end()) {
|
||||
PyErr_SetString(PyExc_KeyError, "Unknown descriptor pool");
|
||||
return NULL;
|
||||
}
|
||||
return it->second;
|
||||
}
|
||||
|
||||
PyObject* PyDescriptorPool_FromPool(const DescriptorPool* pool) {
|
||||
PyDescriptorPool* existing_pool = GetDescriptorPool_FromPool(pool);
|
||||
if (existing_pool != nullptr) {
|
||||
Py_INCREF(existing_pool);
|
||||
return reinterpret_cast<PyObject*>(existing_pool);
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
}
|
||||
|
||||
PyDescriptorPool* cpool = cdescriptor_pool::_CreateDescriptorPool();
|
||||
if (cpool == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
cpool->pool = const_cast<DescriptorPool*>(pool);
|
||||
cpool->is_owned = false;
|
||||
cpool->is_mutable = false;
|
||||
cpool->underlay = nullptr;
|
||||
|
||||
if (!descriptor_pool_map->insert(std::make_pair(cpool->pool, cpool)).second) {
|
||||
// Should never happen -- We already checked the existence above.
|
||||
PyErr_SetString(PyExc_ValueError, "DescriptorPool already registered");
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return reinterpret_cast<PyObject*>(cpool);
|
||||
}
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <unordered_map>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
|
||||
namespace google {
|
||||
@@ -50,16 +50,26 @@ struct CMessageClass;
|
||||
//
|
||||
// There is normally one pool per process. We make it a Python object only
|
||||
// because it contains many Python references.
|
||||
// TODO(amauryfa): See whether such objects can appear in reference cycles, and
|
||||
// consider adding support for the cyclic GC.
|
||||
//
|
||||
// "Methods" that interacts with this DescriptorPool are in the cdescriptor_pool
|
||||
// namespace.
|
||||
typedef struct PyDescriptorPool {
|
||||
PyObject_HEAD
|
||||
PyObject_HEAD;
|
||||
|
||||
// The C++ pool containing Descriptors.
|
||||
DescriptorPool* pool;
|
||||
const DescriptorPool* pool;
|
||||
|
||||
// True if we should free the pointer above.
|
||||
bool is_owned;
|
||||
|
||||
// True if this pool accepts new proto definitions.
|
||||
// In this case it is allowed to const_cast<DescriptorPool*>(pool).
|
||||
bool is_mutable;
|
||||
|
||||
|
||||
// The error collector to store error info. Can be NULL. This pointer is
|
||||
// owned.
|
||||
DescriptorPool::ErrorCollector* error_collector;
|
||||
|
||||
// The C++ pool acting as an underlay. Can be NULL.
|
||||
// This pointer is not owned and must stay alive.
|
||||
@@ -77,7 +87,7 @@ typedef struct PyDescriptorPool {
|
||||
// Cache the options for any kind of descriptor.
|
||||
// Descriptor pointers are owned by the DescriptorPool above.
|
||||
// Python objects are owned by the map.
|
||||
hash_map<const void*, PyObject*>* descriptor_options;
|
||||
std::unordered_map<const void*, PyObject*>* descriptor_options;
|
||||
} PyDescriptorPool;
|
||||
|
||||
|
||||
@@ -86,19 +96,8 @@ extern PyTypeObject PyDescriptorPool_Type;
|
||||
namespace cdescriptor_pool {
|
||||
|
||||
|
||||
// Looks up a message by name.
|
||||
// Returns a message Descriptor, or NULL if not found.
|
||||
const Descriptor* FindMessageTypeByName(PyDescriptorPool* self,
|
||||
const string& name);
|
||||
|
||||
// The functions below are also exposed as methods of the DescriptorPool type.
|
||||
|
||||
// Looks up a message by name. Returns a PyMessageDescriptor corresponding to
|
||||
// the field on success, or NULL on failure.
|
||||
//
|
||||
// Returns a new reference.
|
||||
PyObject* FindMessageByName(PyDescriptorPool* self, PyObject* name);
|
||||
|
||||
// Looks up a field by name. Returns a PyFieldDescriptor corresponding to
|
||||
// the field on success, or NULL on failure.
|
||||
//
|
||||
@@ -125,21 +124,25 @@ PyObject* FindOneofByName(PyDescriptorPool* self, PyObject* arg);
|
||||
|
||||
} // namespace cdescriptor_pool
|
||||
|
||||
// Retrieve the global descriptor pool owned by the _message module.
|
||||
// Retrieves the global descriptor pool owned by the _message module.
|
||||
// This is the one used by pb2.py generated modules.
|
||||
// Returns a *borrowed* reference.
|
||||
// "Default" pool used to register messages from _pb2.py modules.
|
||||
PyDescriptorPool* GetDefaultDescriptorPool();
|
||||
|
||||
// Retrieve the python descriptor pool owning a C++ descriptor pool.
|
||||
// Retrieves an existing python descriptor pool owning the C++ descriptor pool.
|
||||
// Returns a *borrowed* reference.
|
||||
PyDescriptorPool* GetDescriptorPool_FromPool(const DescriptorPool* pool);
|
||||
|
||||
// Wraps a C++ descriptor pool in a Python object, creates it if necessary.
|
||||
// Returns a new reference.
|
||||
PyObject* PyDescriptorPool_FromPool(const DescriptorPool* pool);
|
||||
|
||||
// Initialize objects used by this module.
|
||||
bool InitDescriptorPool();
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
|
||||
@@ -32,14 +32,16 @@
|
||||
// Author: tibell@google.com (Johan Tibell)
|
||||
|
||||
#include <google/protobuf/pyext/extension_dict.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
#include <google/protobuf/message.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
@@ -47,15 +49,12 @@
|
||||
#include <google/protobuf/pyext/repeated_scalar_container.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#if PY_VERSION_HEX < 0x03030000
|
||||
#error "Python 3.0 - 3.2 are not supported."
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob)? \
|
||||
((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
||||
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob) ? ((*(charpp) = const_cast<char*>( \
|
||||
PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL \
|
||||
? -1 \
|
||||
: 0) \
|
||||
: PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -63,12 +62,70 @@ namespace python {
|
||||
|
||||
namespace extension_dict {
|
||||
|
||||
PyObject* len(ExtensionDict* self) {
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
return PyLong_FromLong(PyDict_Size(self->values));
|
||||
#else
|
||||
return PyInt_FromLong(PyDict_Size(self->values));
|
||||
#endif
|
||||
static Py_ssize_t len(ExtensionDict* self) {
|
||||
Py_ssize_t size = 0;
|
||||
std::vector<const FieldDescriptor*> fields;
|
||||
self->parent->message->GetReflection()->ListFields(*self->parent->message,
|
||||
&fields);
|
||||
|
||||
for (size_t i = 0; i < fields.size(); ++i) {
|
||||
if (fields[i]->is_extension()) {
|
||||
// With C++ descriptors, the field can always be retrieved, but for
|
||||
// unknown extensions which have not been imported in Python code, there
|
||||
// is no message class and we cannot retrieve the value.
|
||||
// ListFields() has the same behavior.
|
||||
if (fields[i]->message_type() != nullptr &&
|
||||
message_factory::GetMessageClass(
|
||||
cmessage::GetFactoryForMessage(self->parent),
|
||||
fields[i]->message_type()) == nullptr) {
|
||||
PyErr_Clear();
|
||||
continue;
|
||||
}
|
||||
++size;
|
||||
}
|
||||
}
|
||||
return size;
|
||||
}
|
||||
|
||||
struct ExtensionIterator {
|
||||
PyObject_HEAD;
|
||||
Py_ssize_t index;
|
||||
std::vector<const FieldDescriptor*> fields;
|
||||
|
||||
// Owned reference, to keep the FieldDescriptors alive.
|
||||
ExtensionDict* extension_dict;
|
||||
};
|
||||
|
||||
PyObject* GetIter(PyObject* _self) {
|
||||
ExtensionDict* self = reinterpret_cast<ExtensionDict*>(_self);
|
||||
|
||||
ScopedPyObjectPtr obj(PyType_GenericAlloc(&ExtensionIterator_Type, 0));
|
||||
if (obj == nullptr) {
|
||||
return PyErr_Format(PyExc_MemoryError,
|
||||
"Could not allocate extension iterator");
|
||||
}
|
||||
|
||||
ExtensionIterator* iter = reinterpret_cast<ExtensionIterator*>(obj.get());
|
||||
|
||||
// Call "placement new" to initialize. So the constructor of
|
||||
// std::vector<...> fields will be called.
|
||||
new (iter) ExtensionIterator;
|
||||
|
||||
self->parent->message->GetReflection()->ListFields(*self->parent->message,
|
||||
&iter->fields);
|
||||
iter->index = 0;
|
||||
Py_INCREF(self);
|
||||
iter->extension_dict = self;
|
||||
|
||||
return obj.release();
|
||||
}
|
||||
|
||||
static void DeallocExtensionIterator(PyObject* _self) {
|
||||
ExtensionIterator* self = reinterpret_cast<ExtensionIterator*>(_self);
|
||||
self->fields.clear();
|
||||
Py_XDECREF(self->extension_dict);
|
||||
self->~ExtensionIterator();
|
||||
Py_TYPE(_self)->tp_free(_self);
|
||||
}
|
||||
|
||||
PyObject* subscript(ExtensionDict* self, PyObject* key) {
|
||||
@@ -76,39 +133,32 @@ PyObject* subscript(ExtensionDict* self, PyObject* key) {
|
||||
if (descriptor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
if (!CheckFieldBelongsToMessage(descriptor, self->message)) {
|
||||
if (!CheckFieldBelongsToMessage(descriptor, self->parent->message)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (descriptor->label() != FieldDescriptor::LABEL_REPEATED &&
|
||||
descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
|
||||
return cmessage::InternalGetScalar(self->message, descriptor);
|
||||
return cmessage::InternalGetScalar(self->parent->message, descriptor);
|
||||
}
|
||||
|
||||
PyObject* value = PyDict_GetItem(self->values, key);
|
||||
if (value != NULL) {
|
||||
Py_INCREF(value);
|
||||
return value;
|
||||
}
|
||||
|
||||
if (self->parent == NULL) {
|
||||
// We are in "detached" state. Don't allow further modifications.
|
||||
// TODO(amauryfa): Support adding non-scalars to a detached extension dict.
|
||||
// This probably requires to store the type of the main message.
|
||||
PyErr_SetObject(PyExc_KeyError, key);
|
||||
return NULL;
|
||||
CMessage::CompositeFieldsMap::iterator iterator =
|
||||
self->parent->composite_fields->find(descriptor);
|
||||
if (iterator != self->parent->composite_fields->end()) {
|
||||
Py_INCREF(iterator->second);
|
||||
return iterator->second->AsPyObject();
|
||||
}
|
||||
|
||||
if (descriptor->label() != FieldDescriptor::LABEL_REPEATED &&
|
||||
descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
|
||||
// TODO(plabatut): consider building the class on the fly!
|
||||
PyObject* sub_message = cmessage::InternalGetSubMessage(
|
||||
ContainerBase* sub_message = cmessage::InternalGetSubMessage(
|
||||
self->parent, descriptor);
|
||||
if (sub_message == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyDict_SetItem(self->values, key, sub_message);
|
||||
return sub_message;
|
||||
(*self->parent->composite_fields)[descriptor] = sub_message;
|
||||
return sub_message->AsPyObject();
|
||||
}
|
||||
|
||||
if (descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
|
||||
@@ -131,21 +181,21 @@ PyObject* subscript(ExtensionDict* self, PyObject* key) {
|
||||
if (message_class == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyObject* py_container = repeated_composite_container::NewContainer(
|
||||
ContainerBase* py_container = repeated_composite_container::NewContainer(
|
||||
self->parent, descriptor, message_class);
|
||||
if (py_container == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyDict_SetItem(self->values, key, py_container);
|
||||
return py_container;
|
||||
(*self->parent->composite_fields)[descriptor] = py_container;
|
||||
return py_container->AsPyObject();
|
||||
} else {
|
||||
PyObject* py_container = repeated_scalar_container::NewContainer(
|
||||
ContainerBase* py_container = repeated_scalar_container::NewContainer(
|
||||
self->parent, descriptor);
|
||||
if (py_container == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyDict_SetItem(self->values, key, py_container);
|
||||
return py_container;
|
||||
(*self->parent->composite_fields)[descriptor] = py_container;
|
||||
return py_container->AsPyObject();
|
||||
}
|
||||
}
|
||||
PyErr_SetString(PyExc_ValueError, "control reached unexpected line");
|
||||
@@ -157,24 +207,24 @@ int ass_subscript(ExtensionDict* self, PyObject* key, PyObject* value) {
|
||||
if (descriptor == NULL) {
|
||||
return -1;
|
||||
}
|
||||
if (!CheckFieldBelongsToMessage(descriptor, self->message)) {
|
||||
if (!CheckFieldBelongsToMessage(descriptor, self->parent->message)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (value == nullptr) {
|
||||
return cmessage::ClearFieldByDescriptor(self->parent, descriptor);
|
||||
}
|
||||
|
||||
if (descriptor->label() != FieldDescriptor::LABEL_OPTIONAL ||
|
||||
descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
|
||||
PyErr_SetString(PyExc_TypeError, "Extension is repeated and/or composite "
|
||||
"type");
|
||||
return -1;
|
||||
}
|
||||
if (self->parent) {
|
||||
cmessage::AssureWritable(self->parent);
|
||||
if (cmessage::InternalSetScalar(self->parent, descriptor, value) < 0) {
|
||||
return -1;
|
||||
}
|
||||
cmessage::AssureWritable(self->parent);
|
||||
if (cmessage::InternalSetScalar(self->parent, descriptor, value) < 0) {
|
||||
return -1;
|
||||
}
|
||||
// TODO(tibell): We shouldn't write scalars to the cache.
|
||||
PyDict_SetItem(self->values, key, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -187,11 +237,11 @@ PyObject* _FindExtensionByName(ExtensionDict* self, PyObject* arg) {
|
||||
|
||||
PyDescriptorPool* pool = cmessage::GetFactoryForMessage(self->parent)->pool;
|
||||
const FieldDescriptor* message_extension =
|
||||
pool->pool->FindExtensionByName(string(name, name_size));
|
||||
pool->pool->FindExtensionByName(StringParam(name, name_size));
|
||||
if (message_extension == NULL) {
|
||||
// Is is the name of a message set extension?
|
||||
const Descriptor* message_descriptor = pool->pool->FindMessageTypeByName(
|
||||
string(name, name_size));
|
||||
const Descriptor* message_descriptor =
|
||||
pool->pool->FindMessageTypeByName(StringParam(name, name_size));
|
||||
if (message_descriptor && message_descriptor->extension_count() > 0) {
|
||||
const FieldDescriptor* extension = message_descriptor->extension(0);
|
||||
if (extension->is_extension() &&
|
||||
@@ -210,7 +260,7 @@ PyObject* _FindExtensionByName(ExtensionDict* self, PyObject* arg) {
|
||||
}
|
||||
|
||||
PyObject* _FindExtensionByNumber(ExtensionDict* self, PyObject* arg) {
|
||||
int64 number = PyLong_AsLong(arg);
|
||||
int64_t number = PyLong_AsLong(arg);
|
||||
if (number == -1 && PyErr_Occurred()) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -225,6 +275,35 @@ PyObject* _FindExtensionByNumber(ExtensionDict* self, PyObject* arg) {
|
||||
return PyFieldDescriptor_FromDescriptor(message_extension);
|
||||
}
|
||||
|
||||
static int Contains(PyObject* _self, PyObject* key) {
|
||||
ExtensionDict* self = reinterpret_cast<ExtensionDict*>(_self);
|
||||
const FieldDescriptor* field_descriptor =
|
||||
cmessage::GetExtensionDescriptor(key);
|
||||
if (field_descriptor == nullptr) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!field_descriptor->is_extension()) {
|
||||
PyErr_Format(PyExc_KeyError, "%s is not an extension",
|
||||
field_descriptor->full_name().c_str());
|
||||
return -1;
|
||||
}
|
||||
|
||||
const Message* message = self->parent->message;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
if (field_descriptor->is_repeated()) {
|
||||
if (reflection->FieldSize(*message, field_descriptor) > 0) {
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
if (reflection->HasField(*message, field_descriptor)) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ExtensionDict* NewExtensionDict(CMessage *parent) {
|
||||
ExtensionDict* self = reinterpret_cast<ExtensionDict*>(
|
||||
PyType_GenericAlloc(&ExtensionDict_Type, 0));
|
||||
@@ -232,75 +311,165 @@ ExtensionDict* NewExtensionDict(CMessage *parent) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
self->parent = parent; // Store a borrowed reference.
|
||||
self->message = parent->message;
|
||||
self->owner = parent->owner;
|
||||
self->values = PyDict_New();
|
||||
Py_INCREF(parent);
|
||||
self->parent = parent;
|
||||
return self;
|
||||
}
|
||||
|
||||
void dealloc(ExtensionDict* self) {
|
||||
Py_CLEAR(self->values);
|
||||
self->owner.reset();
|
||||
void dealloc(PyObject* pself) {
|
||||
ExtensionDict* self = reinterpret_cast<ExtensionDict*>(pself);
|
||||
Py_CLEAR(self->parent);
|
||||
Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
|
||||
}
|
||||
|
||||
static PyObject* RichCompare(ExtensionDict* self, PyObject* other, int opid) {
|
||||
// Only equality comparisons are implemented.
|
||||
if (opid != Py_EQ && opid != Py_NE) {
|
||||
Py_INCREF(Py_NotImplemented);
|
||||
return Py_NotImplemented;
|
||||
}
|
||||
bool equals = false;
|
||||
if (PyObject_TypeCheck(other, &ExtensionDict_Type)) {
|
||||
equals = self->parent == reinterpret_cast<ExtensionDict*>(other)->parent;;
|
||||
}
|
||||
if (equals ^ (opid == Py_EQ)) {
|
||||
Py_RETURN_FALSE;
|
||||
} else {
|
||||
Py_RETURN_TRUE;
|
||||
}
|
||||
}
|
||||
static PySequenceMethods SeqMethods = {
|
||||
(lenfunc)len, // sq_length
|
||||
0, // sq_concat
|
||||
0, // sq_repeat
|
||||
0, // sq_item
|
||||
0, // sq_slice
|
||||
0, // sq_ass_item
|
||||
0, // sq_ass_slice
|
||||
(objobjproc)Contains, // sq_contains
|
||||
};
|
||||
|
||||
static PyMappingMethods MpMethods = {
|
||||
(lenfunc)len, /* mp_length */
|
||||
(binaryfunc)subscript, /* mp_subscript */
|
||||
(lenfunc)len, /* mp_length */
|
||||
(binaryfunc)subscript, /* mp_subscript */
|
||||
(objobjargproc)ass_subscript,/* mp_ass_subscript */
|
||||
};
|
||||
|
||||
#define EDMETHOD(name, args, doc) { #name, (PyCFunction)name, args, doc }
|
||||
static PyMethodDef Methods[] = {
|
||||
EDMETHOD(_FindExtensionByName, METH_O,
|
||||
"Finds an extension by name."),
|
||||
EDMETHOD(_FindExtensionByNumber, METH_O,
|
||||
"Finds an extension by field number."),
|
||||
{ NULL, NULL }
|
||||
EDMETHOD(_FindExtensionByName, METH_O, "Finds an extension by name."),
|
||||
EDMETHOD(_FindExtensionByNumber, METH_O,
|
||||
"Finds an extension by field number."),
|
||||
{NULL, NULL},
|
||||
};
|
||||
|
||||
} // namespace extension_dict
|
||||
|
||||
PyTypeObject ExtensionDict_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
FULL_MODULE_NAME ".ExtensionDict", // tp_name
|
||||
sizeof(ExtensionDict), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)extension_dict::dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
&extension_dict::MpMethods, // tp_as_mapping
|
||||
PyObject_HashNotImplemented, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"An extension dict", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
extension_dict::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) //
|
||||
FULL_MODULE_NAME ".ExtensionDict", // tp_name
|
||||
sizeof(ExtensionDict), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
(destructor)extension_dict::dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
&extension_dict::SeqMethods, // tp_as_sequence
|
||||
&extension_dict::MpMethods, // tp_as_mapping
|
||||
PyObject_HashNotImplemented, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"An extension dict", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
(richcmpfunc)extension_dict::RichCompare, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
extension_dict::GetIter, // tp_iter
|
||||
0, // tp_iternext
|
||||
extension_dict::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
};
|
||||
|
||||
PyObject* IterNext(PyObject* _self) {
|
||||
extension_dict::ExtensionIterator* self =
|
||||
reinterpret_cast<extension_dict::ExtensionIterator*>(_self);
|
||||
Py_ssize_t total_size = self->fields.size();
|
||||
Py_ssize_t index = self->index;
|
||||
while (self->index < total_size) {
|
||||
index = self->index;
|
||||
++self->index;
|
||||
if (self->fields[index]->is_extension()) {
|
||||
// With C++ descriptors, the field can always be retrieved, but for
|
||||
// unknown extensions which have not been imported in Python code, there
|
||||
// is no message class and we cannot retrieve the value.
|
||||
// ListFields() has the same behavior.
|
||||
if (self->fields[index]->message_type() != nullptr &&
|
||||
message_factory::GetMessageClass(
|
||||
cmessage::GetFactoryForMessage(self->extension_dict->parent),
|
||||
self->fields[index]->message_type()) == nullptr) {
|
||||
PyErr_Clear();
|
||||
continue;
|
||||
}
|
||||
|
||||
return PyFieldDescriptor_FromDescriptor(self->fields[index]);
|
||||
}
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
PyTypeObject ExtensionIterator_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) //
|
||||
FULL_MODULE_NAME ".ExtensionIterator", // tp_name
|
||||
sizeof(extension_dict::ExtensionIterator), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
extension_dict::DeallocExtensionIterator, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"A scalar map iterator", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
PyObject_SelfIter, // tp_iter
|
||||
IterNext, // tp_iternext
|
||||
0, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
};
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
@@ -51,26 +51,12 @@ namespace python {
|
||||
typedef struct ExtensionDict {
|
||||
PyObject_HEAD;
|
||||
|
||||
// This is the top-level C++ Message object that owns the whole
|
||||
// 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.
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// Weak reference to parent message. Used to make sure
|
||||
// the parent is writable when an extension field is modified.
|
||||
// Strong, owned reference to the parent message. Never NULL.
|
||||
CMessage* parent;
|
||||
|
||||
// Pointer to the C++ Message that this ExtensionDict extends.
|
||||
// Not owned by us.
|
||||
Message* message;
|
||||
|
||||
// A dict of child messages, indexed by Extension descriptors.
|
||||
// Similar to CMessage::composite_fields.
|
||||
PyObject* values;
|
||||
} ExtensionDict;
|
||||
|
||||
extern PyTypeObject ExtensionDict_Type;
|
||||
extern PyTypeObject ExtensionIterator_Type;
|
||||
|
||||
namespace extension_dict {
|
||||
|
||||
@@ -80,6 +66,6 @@ ExtensionDict* NewExtensionDict(CMessage *parent);
|
||||
} // namespace extension_dict
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
|
||||
@@ -0,0 +1,138 @@
|
||||
// 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.
|
||||
|
||||
#include <google/protobuf/pyext/field.h>
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace python {
|
||||
|
||||
namespace field {
|
||||
|
||||
static PyObject* Repr(PyMessageFieldProperty* self) {
|
||||
return PyUnicode_FromFormat("<field property '%s'>",
|
||||
self->field_descriptor->full_name().c_str());
|
||||
}
|
||||
|
||||
static PyObject* DescrGet(PyMessageFieldProperty* self, PyObject* obj,
|
||||
PyObject* type) {
|
||||
if (obj == NULL) {
|
||||
Py_INCREF(self);
|
||||
return reinterpret_cast<PyObject*>(self);
|
||||
}
|
||||
return cmessage::GetFieldValue(reinterpret_cast<CMessage*>(obj),
|
||||
self->field_descriptor);
|
||||
}
|
||||
|
||||
static int DescrSet(PyMessageFieldProperty* self, PyObject* obj,
|
||||
PyObject* value) {
|
||||
if (value == NULL) {
|
||||
PyErr_SetString(PyExc_AttributeError, "Cannot delete field attribute");
|
||||
return -1;
|
||||
}
|
||||
return cmessage::SetFieldValue(reinterpret_cast<CMessage*>(obj),
|
||||
self->field_descriptor, value);
|
||||
}
|
||||
|
||||
static PyObject* GetDescriptor(PyMessageFieldProperty* self, void* closure) {
|
||||
return PyFieldDescriptor_FromDescriptor(self->field_descriptor);
|
||||
}
|
||||
|
||||
static PyObject* GetDoc(PyMessageFieldProperty* self, void* closure) {
|
||||
return PyUnicode_FromFormat("Field %s",
|
||||
self->field_descriptor->full_name().c_str());
|
||||
}
|
||||
|
||||
static PyGetSetDef Getters[] = {
|
||||
{"DESCRIPTOR", (getter)GetDescriptor, NULL, "Field descriptor"},
|
||||
{"__doc__", (getter)GetDoc, NULL, NULL},
|
||||
{NULL}};
|
||||
} // namespace field
|
||||
|
||||
static PyTypeObject _CFieldProperty_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) // head
|
||||
FULL_MODULE_NAME ".FieldProperty", // tp_name
|
||||
sizeof(PyMessageFieldProperty), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
0, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
(reprfunc)field::Repr, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"Field property of a Message", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
0, // tp_methods
|
||||
0, // tp_members
|
||||
field::Getters, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
(descrgetfunc)field::DescrGet, // tp_descr_get
|
||||
(descrsetfunc)field::DescrSet, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
0, // tp_new
|
||||
};
|
||||
PyTypeObject* CFieldProperty_Type = &_CFieldProperty_Type;
|
||||
|
||||
PyObject* NewFieldProperty(const FieldDescriptor* field_descriptor) {
|
||||
// Create a new descriptor object
|
||||
PyMessageFieldProperty* property =
|
||||
PyObject_New(PyMessageFieldProperty, CFieldProperty_Type);
|
||||
if (property == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
property->field_descriptor = field_descriptor;
|
||||
return reinterpret_cast<PyObject*>(property);
|
||||
}
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
+17
-62
@@ -28,77 +28,32 @@
|
||||
// (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__
|
||||
#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
|
||||
#define GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <Python.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
|
||||
class FieldDescriptor;
|
||||
|
||||
namespace python {
|
||||
|
||||
template <typename T>
|
||||
class ThreadUnsafeSharedPtr {
|
||||
public:
|
||||
// Takes ownership.
|
||||
explicit ThreadUnsafeSharedPtr(T* ptr)
|
||||
: ptr_(ptr), refcount_(ptr ? new RefcountT(1) : nullptr) {
|
||||
}
|
||||
// A data descriptor that represents a field in a Message class.
|
||||
struct PyMessageFieldProperty {
|
||||
PyObject_HEAD;
|
||||
|
||||
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_;
|
||||
// This pointer is owned by the same pool as the Message class it belongs to.
|
||||
const FieldDescriptor* field_descriptor;
|
||||
};
|
||||
|
||||
extern PyTypeObject* CFieldProperty_Type;
|
||||
|
||||
PyObject* NewFieldProperty(const FieldDescriptor* field_descriptor);
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_THREAD_UNSAFE_SHARED_PTR_H__
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
|
||||
@@ -32,22 +32,19 @@
|
||||
|
||||
#include <google/protobuf/pyext/map_container.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/map_field.h>
|
||||
#include <google/protobuf/map.h>
|
||||
#include <google/protobuf/map_field.h>
|
||||
#include <google/protobuf/message.h>
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/pyext/repeated_composite_container.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#define PyInt_FromLong PyLong_FromLong
|
||||
#define PyInt_FromSize_t PyLong_FromSize_t
|
||||
#endif
|
||||
#include <google/protobuf/stubs/map_util.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -62,12 +59,15 @@ class MapReflectionFriend {
|
||||
static Py_ssize_t Length(PyObject* _self);
|
||||
static PyObject* GetIterator(PyObject *_self);
|
||||
static PyObject* IterNext(PyObject* _self);
|
||||
static PyObject* MergeFrom(PyObject* _self, PyObject* arg);
|
||||
|
||||
// Methods that differ between the map types.
|
||||
static PyObject* ScalarMapGetItem(PyObject* _self, PyObject* key);
|
||||
static PyObject* MessageMapGetItem(PyObject* _self, PyObject* key);
|
||||
static int ScalarMapSetItem(PyObject* _self, PyObject* key, PyObject* v);
|
||||
static int MessageMapSetItem(PyObject* _self, PyObject* key, PyObject* v);
|
||||
static PyObject* ScalarMapToStr(PyObject* _self);
|
||||
static PyObject* MessageMapToStr(PyObject* _self);
|
||||
};
|
||||
|
||||
struct MapIterator {
|
||||
@@ -79,38 +79,32 @@ struct MapIterator {
|
||||
// We own a ref on this.
|
||||
MapContainer* container;
|
||||
|
||||
// We need to keep a ref on the Message* too, because
|
||||
// We need to keep a ref on the parent Message too, because
|
||||
// MapIterator::~MapIterator() accesses it. Normally this would be ok because
|
||||
// the ref on container (above) would guarantee outlive semantics. However in
|
||||
// the case of ClearField(), InitializeAndCopyToParentContainer() resets the
|
||||
// message pointer (and the owner) to a different message, a copy of the
|
||||
// original. But our iterator still points to the original, which could now
|
||||
// get deleted before us.
|
||||
// the case of ClearField(), the MapContainer points to a different message,
|
||||
// a copy of the original. But our iterator still points to the original,
|
||||
// which could now get deleted before us.
|
||||
//
|
||||
// To prevent this, we ensure that the Message will always stay alive as long
|
||||
// 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.
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
CMessage* parent;
|
||||
// The version of the map when we took the iterator to it.
|
||||
//
|
||||
// We store this so that if the map is modified during iteration we can throw
|
||||
// an error.
|
||||
uint64 version;
|
||||
|
||||
// True if the container is empty. We signal this separately to avoid calling
|
||||
// any of the iteration methods, which are non-const.
|
||||
bool empty;
|
||||
uint64_t version;
|
||||
};
|
||||
|
||||
Message* MapContainer::GetMutableMessage() {
|
||||
cmessage::AssureWritable(parent);
|
||||
return const_cast<Message*>(message);
|
||||
return parent->message;
|
||||
}
|
||||
|
||||
// Consumes a reference on the Python string object.
|
||||
static bool PyStringToSTL(PyObject* py_string, string* stl_string) {
|
||||
static bool PyStringToSTL(PyObject* py_string, std::string* stl_string) {
|
||||
char *value;
|
||||
Py_ssize_t value_len;
|
||||
|
||||
@@ -127,9 +121,9 @@ static bool PyStringToSTL(PyObject* py_string, string* stl_string) {
|
||||
}
|
||||
}
|
||||
|
||||
static bool PythonToMapKey(PyObject* obj,
|
||||
const FieldDescriptor* field_descriptor,
|
||||
MapKey* key) {
|
||||
static bool PythonToMapKey(MapContainer* self, PyObject* obj, MapKey* key) {
|
||||
const FieldDescriptor* field_descriptor =
|
||||
self->parent_field_descriptor->message_type()->map_key();
|
||||
switch (field_descriptor->cpp_type()) {
|
||||
case FieldDescriptor::CPPTYPE_INT32: {
|
||||
GOOGLE_CHECK_GET_INT32(obj, value, false);
|
||||
@@ -157,7 +151,7 @@ static bool PythonToMapKey(PyObject* obj,
|
||||
break;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_STRING: {
|
||||
string str;
|
||||
std::string str;
|
||||
if (!PyStringToSTL(CheckString(obj, field_descriptor), &str)) {
|
||||
return false;
|
||||
}
|
||||
@@ -173,15 +167,16 @@ static bool PythonToMapKey(PyObject* obj,
|
||||
return true;
|
||||
}
|
||||
|
||||
static PyObject* MapKeyToPython(const FieldDescriptor* field_descriptor,
|
||||
const MapKey& key) {
|
||||
static PyObject* MapKeyToPython(MapContainer* self, const MapKey& key) {
|
||||
const FieldDescriptor* field_descriptor =
|
||||
self->parent_field_descriptor->message_type()->map_key();
|
||||
switch (field_descriptor->cpp_type()) {
|
||||
case FieldDescriptor::CPPTYPE_INT32:
|
||||
return PyInt_FromLong(key.GetInt32Value());
|
||||
return PyLong_FromLong(key.GetInt32Value());
|
||||
case FieldDescriptor::CPPTYPE_INT64:
|
||||
return PyLong_FromLongLong(key.GetInt64Value());
|
||||
case FieldDescriptor::CPPTYPE_UINT32:
|
||||
return PyInt_FromSize_t(key.GetUInt32Value());
|
||||
return PyLong_FromSize_t(key.GetUInt32Value());
|
||||
case FieldDescriptor::CPPTYPE_UINT64:
|
||||
return PyLong_FromUnsignedLongLong(key.GetUInt64Value());
|
||||
case FieldDescriptor::CPPTYPE_BOOL:
|
||||
@@ -198,27 +193,28 @@ static PyObject* MapKeyToPython(const FieldDescriptor* field_descriptor,
|
||||
|
||||
// This is only used for ScalarMap, so we don't need to handle the
|
||||
// CPPTYPE_MESSAGE case.
|
||||
PyObject* MapValueRefToPython(const FieldDescriptor* field_descriptor,
|
||||
MapValueRef* value) {
|
||||
PyObject* MapValueRefToPython(MapContainer* self, const MapValueRef& value) {
|
||||
const FieldDescriptor* field_descriptor =
|
||||
self->parent_field_descriptor->message_type()->map_value();
|
||||
switch (field_descriptor->cpp_type()) {
|
||||
case FieldDescriptor::CPPTYPE_INT32:
|
||||
return PyInt_FromLong(value->GetInt32Value());
|
||||
return PyLong_FromLong(value.GetInt32Value());
|
||||
case FieldDescriptor::CPPTYPE_INT64:
|
||||
return PyLong_FromLongLong(value->GetInt64Value());
|
||||
return PyLong_FromLongLong(value.GetInt64Value());
|
||||
case FieldDescriptor::CPPTYPE_UINT32:
|
||||
return PyInt_FromSize_t(value->GetUInt32Value());
|
||||
return PyLong_FromSize_t(value.GetUInt32Value());
|
||||
case FieldDescriptor::CPPTYPE_UINT64:
|
||||
return PyLong_FromUnsignedLongLong(value->GetUInt64Value());
|
||||
return PyLong_FromUnsignedLongLong(value.GetUInt64Value());
|
||||
case FieldDescriptor::CPPTYPE_FLOAT:
|
||||
return PyFloat_FromDouble(value->GetFloatValue());
|
||||
return PyFloat_FromDouble(value.GetFloatValue());
|
||||
case FieldDescriptor::CPPTYPE_DOUBLE:
|
||||
return PyFloat_FromDouble(value->GetDoubleValue());
|
||||
return PyFloat_FromDouble(value.GetDoubleValue());
|
||||
case FieldDescriptor::CPPTYPE_BOOL:
|
||||
return PyBool_FromLong(value->GetBoolValue());
|
||||
return PyBool_FromLong(value.GetBoolValue());
|
||||
case FieldDescriptor::CPPTYPE_STRING:
|
||||
return ToStringObject(field_descriptor, value->GetStringValue());
|
||||
return ToStringObject(field_descriptor, value.GetStringValue());
|
||||
case FieldDescriptor::CPPTYPE_ENUM:
|
||||
return PyInt_FromLong(value->GetEnumValue());
|
||||
return PyLong_FromLong(value.GetEnumValue());
|
||||
default:
|
||||
PyErr_Format(
|
||||
PyExc_SystemError, "Couldn't convert type %d to value",
|
||||
@@ -229,10 +225,11 @@ PyObject* MapValueRefToPython(const FieldDescriptor* field_descriptor,
|
||||
|
||||
// This is only used for ScalarMap, so we don't need to handle the
|
||||
// CPPTYPE_MESSAGE case.
|
||||
static bool PythonToMapValueRef(PyObject* obj,
|
||||
const FieldDescriptor* field_descriptor,
|
||||
static bool PythonToMapValueRef(MapContainer* self, PyObject* obj,
|
||||
bool allow_unknown_enum_values,
|
||||
MapValueRef* value_ref) {
|
||||
const FieldDescriptor* field_descriptor =
|
||||
self->parent_field_descriptor->message_type()->map_value();
|
||||
switch (field_descriptor->cpp_type()) {
|
||||
case FieldDescriptor::CPPTYPE_INT32: {
|
||||
GOOGLE_CHECK_GET_INT32(obj, value, false);
|
||||
@@ -270,7 +267,7 @@ static bool PythonToMapValueRef(PyObject* obj,
|
||||
return true;;
|
||||
}
|
||||
case FieldDescriptor::CPPTYPE_STRING: {
|
||||
string str;
|
||||
std::string str;
|
||||
if (!PyStringToSTL(CheckString(obj, field_descriptor), &str)) {
|
||||
return false;
|
||||
}
|
||||
@@ -312,7 +309,7 @@ static MapContainer* GetMap(PyObject* obj) {
|
||||
|
||||
Py_ssize_t MapReflectionFriend::Length(PyObject* _self) {
|
||||
MapContainer* self = GetMap(_self);
|
||||
const google::protobuf::Message* message = self->message;
|
||||
const google::protobuf::Message* message = self->parent->message;
|
||||
return message->GetReflection()->MapSize(*message,
|
||||
self->parent_field_descriptor);
|
||||
}
|
||||
@@ -336,20 +333,23 @@ PyObject* GetEntryClass(PyObject* _self) {
|
||||
return reinterpret_cast<PyObject*>(message_class);
|
||||
}
|
||||
|
||||
PyObject* MergeFrom(PyObject* _self, PyObject* arg) {
|
||||
PyObject* MapReflectionFriend::MergeFrom(PyObject* _self, PyObject* arg) {
|
||||
MapContainer* self = GetMap(_self);
|
||||
if (!PyObject_TypeCheck(arg, ScalarMapContainer_Type) &&
|
||||
!PyObject_TypeCheck(arg, MessageMapContainer_Type)) {
|
||||
PyErr_SetString(PyExc_AttributeError, "Not a map field");
|
||||
return nullptr;
|
||||
}
|
||||
MapContainer* other_map = GetMap(arg);
|
||||
Message* message = self->GetMutableMessage();
|
||||
const Message* other_message = other_map->message;
|
||||
const Message* other_message = other_map->parent->message;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
const Reflection* other_reflection = other_message->GetReflection();
|
||||
int count = other_reflection->FieldSize(
|
||||
internal::MapFieldBase* field = reflection->MutableMapData(
|
||||
message, self->parent_field_descriptor);
|
||||
const internal::MapFieldBase* other_field = other_reflection->GetMapData(
|
||||
*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));
|
||||
}
|
||||
field->MergeFrom(*other_field);
|
||||
self->version++;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
@@ -357,11 +357,11 @@ PyObject* MergeFrom(PyObject* _self, PyObject* arg) {
|
||||
PyObject* MapReflectionFriend::Contains(PyObject* _self, PyObject* key) {
|
||||
MapContainer* self = GetMap(_self);
|
||||
|
||||
const Message* message = self->message;
|
||||
const Message* message = self->parent->message;
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
MapKey map_key;
|
||||
|
||||
if (!PythonToMapKey(key, self->key_field_descriptor, &map_key)) {
|
||||
if (!PythonToMapKey(self, key, &map_key)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -373,85 +373,29 @@ PyObject* MapReflectionFriend::Contains(PyObject* _self, PyObject* key) {
|
||||
}
|
||||
}
|
||||
|
||||
// Initializes the underlying Message object of "to" so it becomes a new parent
|
||||
// map container, and copies all the values from "from" to it. A child map
|
||||
// container can be released by passing it as both from and to (e.g. making it
|
||||
// the recipient of the new parent message and copying the values from itself).
|
||||
// In fact, this is the only supported use at the moment.
|
||||
static int InitializeAndCopyToParentContainer(MapContainer* from,
|
||||
MapContainer* to) {
|
||||
// For now we require from == to, re-evaluate if we want to support deep copy
|
||||
// as in repeated_scalar_container.cc.
|
||||
GOOGLE_DCHECK(from == to);
|
||||
Message* new_message = from->message->New();
|
||||
|
||||
if (MapReflectionFriend::Length(reinterpret_cast<PyObject*>(from)) > 0) {
|
||||
// A somewhat roundabout way of copying just one field from old_message to
|
||||
// new_message. This is the best we can do with what Reflection gives us.
|
||||
Message* mutable_old = from->GetMutableMessage();
|
||||
std::vector<const FieldDescriptor*> fields;
|
||||
fields.push_back(from->parent_field_descriptor);
|
||||
|
||||
// Move the map field into the new message.
|
||||
mutable_old->GetReflection()->SwapFields(mutable_old, new_message, fields);
|
||||
|
||||
// If/when we support from != to, this will be required also to copy the
|
||||
// map field back into the existing message:
|
||||
// mutable_old->MergeFrom(*new_message);
|
||||
}
|
||||
|
||||
// If from == to this could delete old_message.
|
||||
to->owner.reset(new_message);
|
||||
|
||||
to->parent = NULL;
|
||||
to->parent_field_descriptor = from->parent_field_descriptor;
|
||||
to->message = new_message;
|
||||
|
||||
// Invalidate iterators, since they point to the old copy of the field.
|
||||
to->version++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int MapContainer::Release() {
|
||||
return InitializeAndCopyToParentContainer(this, this);
|
||||
}
|
||||
|
||||
|
||||
// ScalarMap ///////////////////////////////////////////////////////////////////
|
||||
|
||||
PyObject *NewScalarMapContainer(
|
||||
MapContainer* NewScalarMapContainer(
|
||||
CMessage* parent, const google::protobuf::FieldDescriptor* parent_field_descriptor) {
|
||||
if (!CheckFieldBelongsToMessage(parent_field_descriptor, parent->message)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ScopedPyObjectPtr obj(PyType_GenericAlloc(ScalarMapContainer_Type, 0));
|
||||
if (obj.get() == NULL) {
|
||||
return PyErr_Format(PyExc_RuntimeError,
|
||||
"Could not allocate new container.");
|
||||
PyObject* obj(PyType_GenericAlloc(ScalarMapContainer_Type, 0));
|
||||
if (obj == NULL) {
|
||||
PyErr_Format(PyExc_RuntimeError,
|
||||
"Could not allocate new container.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
MapContainer* self = GetMap(obj.get());
|
||||
MapContainer* self = GetMap(obj);
|
||||
|
||||
self->message = parent->message;
|
||||
Py_INCREF(parent);
|
||||
self->parent = parent;
|
||||
self->parent_field_descriptor = parent_field_descriptor;
|
||||
self->owner = parent->owner;
|
||||
self->version = 0;
|
||||
|
||||
self->key_field_descriptor =
|
||||
parent_field_descriptor->message_type()->FindFieldByName("key");
|
||||
self->value_field_descriptor =
|
||||
parent_field_descriptor->message_type()->FindFieldByName("value");
|
||||
|
||||
if (self->key_field_descriptor == NULL ||
|
||||
self->value_field_descriptor == NULL) {
|
||||
return PyErr_Format(PyExc_KeyError,
|
||||
"Map entry descriptor did not have key/value fields");
|
||||
}
|
||||
|
||||
return obj.release();
|
||||
return self;
|
||||
}
|
||||
|
||||
PyObject* MapReflectionFriend::ScalarMapGetItem(PyObject* _self,
|
||||
@@ -463,7 +407,7 @@ PyObject* MapReflectionFriend::ScalarMapGetItem(PyObject* _self,
|
||||
MapKey map_key;
|
||||
MapValueRef value;
|
||||
|
||||
if (!PythonToMapKey(key, self->key_field_descriptor, &map_key)) {
|
||||
if (!PythonToMapKey(self, key, &map_key)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -472,7 +416,7 @@ PyObject* MapReflectionFriend::ScalarMapGetItem(PyObject* _self,
|
||||
self->version++;
|
||||
}
|
||||
|
||||
return MapValueRefToPython(self->value_field_descriptor, &value);
|
||||
return MapValueRefToPython(self, value);
|
||||
}
|
||||
|
||||
int MapReflectionFriend::ScalarMapSetItem(PyObject* _self, PyObject* key,
|
||||
@@ -484,7 +428,7 @@ int MapReflectionFriend::ScalarMapSetItem(PyObject* _self, PyObject* key,
|
||||
MapKey map_key;
|
||||
MapValueRef value;
|
||||
|
||||
if (!PythonToMapKey(key, self->key_field_descriptor, &map_key)) {
|
||||
if (!PythonToMapKey(self, key, &map_key)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -495,10 +439,11 @@ int MapReflectionFriend::ScalarMapSetItem(PyObject* _self, PyObject* key,
|
||||
reflection->InsertOrLookupMapValue(message, self->parent_field_descriptor,
|
||||
map_key, &value);
|
||||
|
||||
return PythonToMapValueRef(v, self->value_field_descriptor,
|
||||
reflection->SupportsUnknownEnumValues(), &value)
|
||||
? 0
|
||||
: -1;
|
||||
if (!PythonToMapValueRef(self, v, reflection->SupportsUnknownEnumValues(),
|
||||
&value)) {
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
} else {
|
||||
// Delete key from map.
|
||||
if (reflection->DeleteMapValue(message, self->parent_field_descriptor,
|
||||
@@ -511,10 +456,14 @@ int MapReflectionFriend::ScalarMapSetItem(PyObject* _self, PyObject* key,
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject* ScalarMapGet(PyObject* self, PyObject* args) {
|
||||
static PyObject* ScalarMapGet(PyObject* self, PyObject* args,
|
||||
PyObject* kwargs) {
|
||||
static const char* kwlist[] = {"key", "default", nullptr};
|
||||
PyObject* key;
|
||||
PyObject* default_value = NULL;
|
||||
if (PyArg_ParseTuple(args, "O|O", &key, &default_value) < 0) {
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O",
|
||||
const_cast<char**>(kwlist), &key,
|
||||
&default_value)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -535,98 +484,82 @@ static PyObject* ScalarMapGet(PyObject* self, PyObject* args) {
|
||||
}
|
||||
}
|
||||
|
||||
PyObject* MapReflectionFriend::ScalarMapToStr(PyObject* _self) {
|
||||
ScopedPyObjectPtr dict(PyDict_New());
|
||||
if (dict == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr key;
|
||||
ScopedPyObjectPtr value;
|
||||
|
||||
MapContainer* self = GetMap(_self);
|
||||
Message* message = self->GetMutableMessage();
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
for (google::protobuf::MapIterator it = reflection->MapBegin(
|
||||
message, self->parent_field_descriptor);
|
||||
it != reflection->MapEnd(message, self->parent_field_descriptor);
|
||||
++it) {
|
||||
key.reset(MapKeyToPython(self, it.GetKey()));
|
||||
if (key == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
value.reset(MapValueRefToPython(self, it.GetValueRef()));
|
||||
if (value == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
if (PyDict_SetItem(dict.get(), key.get(), value.get()) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return PyObject_Repr(dict.get());
|
||||
}
|
||||
|
||||
static void ScalarMapDealloc(PyObject* _self) {
|
||||
MapContainer* self = GetMap(_self);
|
||||
self->owner.reset();
|
||||
Py_TYPE(_self)->tp_free(_self);
|
||||
self->RemoveFromParentCache();
|
||||
PyTypeObject *type = Py_TYPE(_self);
|
||||
type->tp_free(_self);
|
||||
if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
|
||||
// With Python3, the Map class is not static, and must be managed.
|
||||
Py_DECREF(type);
|
||||
}
|
||||
}
|
||||
|
||||
static PyMethodDef ScalarMapMethods[] = {
|
||||
{ "__contains__", MapReflectionFriend::Contains, METH_O,
|
||||
"Tests whether a key is a member of the map." },
|
||||
{ "clear", (PyCFunction)Clear, METH_NOARGS,
|
||||
"Removes all elements from the map." },
|
||||
{ "get", ScalarMapGet, METH_VARARGS,
|
||||
"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." },
|
||||
{ "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
|
||||
"Outputs picklable representation of the repeated field." },
|
||||
*/
|
||||
{NULL, NULL},
|
||||
{"__contains__", MapReflectionFriend::Contains, METH_O,
|
||||
"Tests whether a key is a member of the map."},
|
||||
{"clear", (PyCFunction)Clear, METH_NOARGS,
|
||||
"Removes all elements from the map."},
|
||||
{"get", (PyCFunction)ScalarMapGet, METH_VARARGS | METH_KEYWORDS,
|
||||
"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)MapReflectionFriend::MergeFrom, METH_O,
|
||||
"Merges a map into the current map."},
|
||||
/*
|
||||
{ "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
|
||||
"Makes a deep copy of the class." },
|
||||
{ "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
|
||||
"Outputs picklable representation of the repeated field." },
|
||||
*/
|
||||
{NULL, NULL},
|
||||
};
|
||||
|
||||
PyTypeObject *ScalarMapContainer_Type;
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
static PyType_Slot ScalarMapContainer_Type_slots[] = {
|
||||
{Py_tp_dealloc, (void *)ScalarMapDealloc},
|
||||
{Py_mp_length, (void *)MapReflectionFriend::Length},
|
||||
{Py_mp_subscript, (void *)MapReflectionFriend::ScalarMapGetItem},
|
||||
{Py_mp_ass_subscript, (void *)MapReflectionFriend::ScalarMapSetItem},
|
||||
{Py_tp_methods, (void *)ScalarMapMethods},
|
||||
{Py_tp_iter, (void *)MapReflectionFriend::GetIterator},
|
||||
{0, 0},
|
||||
};
|
||||
|
||||
PyType_Spec ScalarMapContainer_Type_spec = {
|
||||
FULL_MODULE_NAME ".ScalarMapContainer",
|
||||
sizeof(MapContainer),
|
||||
0,
|
||||
Py_TPFLAGS_DEFAULT,
|
||||
ScalarMapContainer_Type_slots
|
||||
};
|
||||
#else
|
||||
static PyMappingMethods ScalarMapMappingMethods = {
|
||||
MapReflectionFriend::Length, // mp_length
|
||||
MapReflectionFriend::ScalarMapGetItem, // mp_subscript
|
||||
MapReflectionFriend::ScalarMapSetItem, // mp_ass_subscript
|
||||
};
|
||||
|
||||
PyTypeObject _ScalarMapContainer_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
FULL_MODULE_NAME ".ScalarMapContainer", // tp_name
|
||||
sizeof(MapContainer), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
ScalarMapDealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
&ScalarMapMappingMethods, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"A scalar map container", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
MapReflectionFriend::GetIterator, // tp_iter
|
||||
0, // tp_iternext
|
||||
ScalarMapMethods, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
};
|
||||
#endif
|
||||
PyTypeObject* ScalarMapContainer_Type;
|
||||
static PyType_Slot ScalarMapContainer_Type_slots[] = {
|
||||
{Py_tp_dealloc, (void*)ScalarMapDealloc},
|
||||
{Py_mp_length, (void*)MapReflectionFriend::Length},
|
||||
{Py_mp_subscript, (void*)MapReflectionFriend::ScalarMapGetItem},
|
||||
{Py_mp_ass_subscript, (void*)MapReflectionFriend::ScalarMapSetItem},
|
||||
{Py_tp_methods, (void*)ScalarMapMethods},
|
||||
{Py_tp_iter, (void*)MapReflectionFriend::GetIterator},
|
||||
{Py_tp_repr, (void*)MapReflectionFriend::ScalarMapToStr},
|
||||
{0, 0},
|
||||
};
|
||||
|
||||
PyType_Spec ScalarMapContainer_Type_spec = {
|
||||
FULL_MODULE_NAME ".ScalarMapContainer", sizeof(MapContainer), 0,
|
||||
Py_TPFLAGS_DEFAULT, ScalarMapContainer_Type_slots};
|
||||
|
||||
// MessageMap //////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -636,32 +569,13 @@ static MessageMapContainer* GetMessageMap(PyObject* obj) {
|
||||
|
||||
static PyObject* GetCMessage(MessageMapContainer* self, Message* message) {
|
||||
// Get or create the CMessage object corresponding to this message.
|
||||
ScopedPyObjectPtr key(PyLong_FromVoidPtr(message));
|
||||
PyObject* ret = PyDict_GetItem(self->message_dict, key.get());
|
||||
|
||||
if (ret == NULL) {
|
||||
CMessage* cmsg = cmessage::NewEmptyMessage(self->message_class);
|
||||
ret = reinterpret_cast<PyObject*>(cmsg);
|
||||
|
||||
if (cmsg == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
cmsg->owner = self->owner;
|
||||
cmsg->message = message;
|
||||
cmsg->parent = self->parent;
|
||||
|
||||
if (PyDict_SetItem(self->message_dict, key.get(), ret) < 0) {
|
||||
Py_DECREF(ret);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
Py_INCREF(ret);
|
||||
}
|
||||
|
||||
return ret;
|
||||
return self->parent
|
||||
->BuildSubMessageFromPointer(self->parent_field_descriptor, message,
|
||||
self->message_class)
|
||||
->AsPyObject();
|
||||
}
|
||||
|
||||
PyObject* NewMessageMapContainer(
|
||||
MessageMapContainer* NewMessageMapContainer(
|
||||
CMessage* parent, const google::protobuf::FieldDescriptor* parent_field_descriptor,
|
||||
CMessageClass* message_class) {
|
||||
if (!CheckFieldBelongsToMessage(parent_field_descriptor, parent->message)) {
|
||||
@@ -670,40 +584,21 @@ PyObject* NewMessageMapContainer(
|
||||
|
||||
PyObject* obj = PyType_GenericAlloc(MessageMapContainer_Type, 0);
|
||||
if (obj == NULL) {
|
||||
return PyErr_Format(PyExc_RuntimeError,
|
||||
"Could not allocate new container.");
|
||||
PyErr_SetString(PyExc_RuntimeError, "Could not allocate new container.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
MessageMapContainer* self = GetMessageMap(obj);
|
||||
|
||||
self->message = parent->message;
|
||||
Py_INCREF(parent);
|
||||
self->parent = parent;
|
||||
self->parent_field_descriptor = parent_field_descriptor;
|
||||
self->owner = parent->owner;
|
||||
self->version = 0;
|
||||
|
||||
self->key_field_descriptor =
|
||||
parent_field_descriptor->message_type()->FindFieldByName("key");
|
||||
self->value_field_descriptor =
|
||||
parent_field_descriptor->message_type()->FindFieldByName("value");
|
||||
|
||||
self->message_dict = PyDict_New();
|
||||
if (self->message_dict == NULL) {
|
||||
return PyErr_Format(PyExc_RuntimeError,
|
||||
"Could not allocate message dict.");
|
||||
}
|
||||
|
||||
Py_INCREF(message_class);
|
||||
self->message_class = message_class;
|
||||
|
||||
if (self->key_field_descriptor == NULL ||
|
||||
self->value_field_descriptor == NULL) {
|
||||
Py_DECREF(obj);
|
||||
return PyErr_Format(PyExc_KeyError,
|
||||
"Map entry descriptor did not have key/value fields");
|
||||
}
|
||||
|
||||
return obj;
|
||||
return self;
|
||||
}
|
||||
|
||||
int MapReflectionFriend::MessageMapSetItem(PyObject* _self, PyObject* key,
|
||||
@@ -724,7 +619,7 @@ int MapReflectionFriend::MessageMapSetItem(PyObject* _self, PyObject* key,
|
||||
|
||||
self->version++;
|
||||
|
||||
if (!PythonToMapKey(key, self->key_field_descriptor, &map_key)) {
|
||||
if (!PythonToMapKey(self, key, &map_key)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -735,22 +630,14 @@ int MapReflectionFriend::MessageMapSetItem(PyObject* _self, PyObject* key,
|
||||
MapValueRef value;
|
||||
reflection->InsertOrLookupMapValue(message, self->parent_field_descriptor,
|
||||
map_key, &value);
|
||||
ScopedPyObjectPtr key(PyLong_FromVoidPtr(value.MutableMessageValue()));
|
||||
|
||||
PyObject* cmsg_value = PyDict_GetItem(self->message_dict, key.get());
|
||||
if (cmsg_value) {
|
||||
// Need to keep CMessage stay alive if it is still referenced after
|
||||
// deletion. Makes a new message and swaps values into CMessage
|
||||
// instead of just removing.
|
||||
CMessage* cmsg = reinterpret_cast<CMessage*>(cmsg_value);
|
||||
Message* msg = cmsg->message;
|
||||
cmsg->owner.reset(msg->New());
|
||||
cmsg->message = cmsg->owner.get();
|
||||
cmsg->parent = NULL;
|
||||
msg->GetReflection()->Swap(msg, cmsg->message);
|
||||
if (PyDict_DelItem(self->message_dict, key.get()) < 0) {
|
||||
return -1;
|
||||
}
|
||||
Message* sub_message = value.MutableMessageValue();
|
||||
// If there is a living weak reference to an item, we "Release" it,
|
||||
// otherwise we just discard the C++ value.
|
||||
if (CMessage* released =
|
||||
self->parent->MaybeReleaseSubMessage(sub_message)) {
|
||||
Message* msg = released->message;
|
||||
released->message = msg->New();
|
||||
msg->GetReflection()->Swap(msg, released->message);
|
||||
}
|
||||
|
||||
// Delete key from map.
|
||||
@@ -772,7 +659,7 @@ PyObject* MapReflectionFriend::MessageMapGetItem(PyObject* _self,
|
||||
MapKey map_key;
|
||||
MapValueRef value;
|
||||
|
||||
if (!PythonToMapKey(key, self->key_field_descriptor, &map_key)) {
|
||||
if (!PythonToMapKey(self, key, &map_key)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -784,10 +671,43 @@ PyObject* MapReflectionFriend::MessageMapGetItem(PyObject* _self,
|
||||
return GetCMessage(self, value.MutableMessageValue());
|
||||
}
|
||||
|
||||
PyObject* MessageMapGet(PyObject* self, PyObject* args) {
|
||||
PyObject* MapReflectionFriend::MessageMapToStr(PyObject* _self) {
|
||||
ScopedPyObjectPtr dict(PyDict_New());
|
||||
if (dict == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr key;
|
||||
ScopedPyObjectPtr value;
|
||||
|
||||
MessageMapContainer* self = GetMessageMap(_self);
|
||||
Message* message = self->GetMutableMessage();
|
||||
const Reflection* reflection = message->GetReflection();
|
||||
for (google::protobuf::MapIterator it = reflection->MapBegin(
|
||||
message, self->parent_field_descriptor);
|
||||
it != reflection->MapEnd(message, self->parent_field_descriptor);
|
||||
++it) {
|
||||
key.reset(MapKeyToPython(self, it.GetKey()));
|
||||
if (key == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
value.reset(GetCMessage(self, it.MutableValueRef()->MutableMessageValue()));
|
||||
if (value == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
if (PyDict_SetItem(dict.get(), key.get(), value.get()) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return PyObject_Repr(dict.get());
|
||||
}
|
||||
|
||||
PyObject* MessageMapGet(PyObject* self, PyObject* args, PyObject* kwargs) {
|
||||
static const char* kwlist[] = {"key", "default", nullptr};
|
||||
PyObject* key;
|
||||
PyObject* default_value = NULL;
|
||||
if (PyArg_ParseTuple(args, "O|O", &key, &default_value) < 0) {
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O",
|
||||
const_cast<char**>(kwlist), &key,
|
||||
&default_value)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -810,99 +730,52 @@ PyObject* MessageMapGet(PyObject* self, PyObject* args) {
|
||||
|
||||
static void MessageMapDealloc(PyObject* _self) {
|
||||
MessageMapContainer* self = GetMessageMap(_self);
|
||||
self->owner.reset();
|
||||
Py_DECREF(self->message_dict);
|
||||
self->RemoveFromParentCache();
|
||||
Py_DECREF(self->message_class);
|
||||
Py_TYPE(_self)->tp_free(_self);
|
||||
PyTypeObject *type = Py_TYPE(_self);
|
||||
type->tp_free(_self);
|
||||
if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
|
||||
// With Python3, the Map class is not static, and must be managed.
|
||||
Py_DECREF(type);
|
||||
}
|
||||
}
|
||||
|
||||
static PyMethodDef MessageMapMethods[] = {
|
||||
{ "__contains__", (PyCFunction)MapReflectionFriend::Contains, METH_O,
|
||||
"Tests whether the map contains this element."},
|
||||
{ "clear", (PyCFunction)Clear, METH_NOARGS,
|
||||
"Removes all elements from the map."},
|
||||
{ "get", MessageMapGet, METH_VARARGS,
|
||||
"Gets the value for the given key if present, or otherwise a default" },
|
||||
{ "get_or_create", MapReflectionFriend::MessageMapGetItem, METH_O,
|
||||
"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." },
|
||||
{ "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
|
||||
"Outputs picklable representation of the repeated field." },
|
||||
*/
|
||||
{NULL, NULL},
|
||||
{"__contains__", (PyCFunction)MapReflectionFriend::Contains, METH_O,
|
||||
"Tests whether the map contains this element."},
|
||||
{"clear", (PyCFunction)Clear, METH_NOARGS,
|
||||
"Removes all elements from the map."},
|
||||
{"get", (PyCFunction)MessageMapGet, METH_VARARGS | METH_KEYWORDS,
|
||||
"Gets the value for the given key if present, or otherwise a default"},
|
||||
{"get_or_create", MapReflectionFriend::MessageMapGetItem, METH_O,
|
||||
"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)MapReflectionFriend::MergeFrom, METH_O,
|
||||
"Merges a map into the current map."},
|
||||
/*
|
||||
{ "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
|
||||
"Makes a deep copy of the class." },
|
||||
{ "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
|
||||
"Outputs picklable representation of the repeated field." },
|
||||
*/
|
||||
{NULL, NULL},
|
||||
};
|
||||
|
||||
PyTypeObject *MessageMapContainer_Type;
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
static PyType_Slot MessageMapContainer_Type_slots[] = {
|
||||
{Py_tp_dealloc, (void *)MessageMapDealloc},
|
||||
{Py_mp_length, (void *)MapReflectionFriend::Length},
|
||||
{Py_mp_subscript, (void *)MapReflectionFriend::MessageMapGetItem},
|
||||
{Py_mp_ass_subscript, (void *)MapReflectionFriend::MessageMapSetItem},
|
||||
{Py_tp_methods, (void *)MessageMapMethods},
|
||||
{Py_tp_iter, (void *)MapReflectionFriend::GetIterator},
|
||||
{0, 0}
|
||||
};
|
||||
PyTypeObject* MessageMapContainer_Type;
|
||||
static PyType_Slot MessageMapContainer_Type_slots[] = {
|
||||
{Py_tp_dealloc, (void*)MessageMapDealloc},
|
||||
{Py_mp_length, (void*)MapReflectionFriend::Length},
|
||||
{Py_mp_subscript, (void*)MapReflectionFriend::MessageMapGetItem},
|
||||
{Py_mp_ass_subscript, (void*)MapReflectionFriend::MessageMapSetItem},
|
||||
{Py_tp_methods, (void*)MessageMapMethods},
|
||||
{Py_tp_iter, (void*)MapReflectionFriend::GetIterator},
|
||||
{Py_tp_repr, (void*)MapReflectionFriend::MessageMapToStr},
|
||||
{0, 0}};
|
||||
|
||||
PyType_Spec MessageMapContainer_Type_spec = {
|
||||
FULL_MODULE_NAME ".MessageMapContainer",
|
||||
sizeof(MessageMapContainer),
|
||||
0,
|
||||
Py_TPFLAGS_DEFAULT,
|
||||
MessageMapContainer_Type_slots
|
||||
};
|
||||
#else
|
||||
static PyMappingMethods MessageMapMappingMethods = {
|
||||
MapReflectionFriend::Length, // mp_length
|
||||
MapReflectionFriend::MessageMapGetItem, // mp_subscript
|
||||
MapReflectionFriend::MessageMapSetItem, // mp_ass_subscript
|
||||
};
|
||||
|
||||
PyTypeObject _MessageMapContainer_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
FULL_MODULE_NAME ".MessageMapContainer", // tp_name
|
||||
sizeof(MessageMapContainer), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
MessageMapDealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
&MessageMapMappingMethods, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT, // tp_flags
|
||||
"A map container for message", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
MapReflectionFriend::GetIterator, // tp_iter
|
||||
0, // tp_iternext
|
||||
MessageMapMethods, // tp_methods
|
||||
0, // tp_members
|
||||
0, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
};
|
||||
#endif
|
||||
PyType_Spec MessageMapContainer_Type_spec = {
|
||||
FULL_MODULE_NAME ".MessageMapContainer", sizeof(MessageMapContainer), 0,
|
||||
Py_TPFLAGS_DEFAULT, MessageMapContainer_Type_slots};
|
||||
|
||||
// MapIterator /////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -923,7 +796,8 @@ PyObject* MapReflectionFriend::GetIterator(PyObject *_self) {
|
||||
Py_INCREF(self);
|
||||
iter->container = self;
|
||||
iter->version = self->version;
|
||||
iter->owner = self->owner;
|
||||
Py_INCREF(self->parent);
|
||||
iter->parent = self->parent;
|
||||
|
||||
if (MapReflectionFriend::Length(_self) > 0) {
|
||||
Message* message = self->GetMutableMessage();
|
||||
@@ -945,6 +819,10 @@ PyObject* MapReflectionFriend::IterNext(PyObject* _self) {
|
||||
return PyErr_Format(PyExc_RuntimeError,
|
||||
"Map modified during iteration.");
|
||||
}
|
||||
if (self->parent != self->container->parent) {
|
||||
return PyErr_Format(PyExc_RuntimeError,
|
||||
"Map cleared during iteration.");
|
||||
}
|
||||
|
||||
if (self->iter.get() == NULL) {
|
||||
return NULL;
|
||||
@@ -958,8 +836,7 @@ PyObject* MapReflectionFriend::IterNext(PyObject* _self) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PyObject* ret = MapKeyToPython(self->container->key_field_descriptor,
|
||||
self->iter->GetKey());
|
||||
PyObject* ret = MapKeyToPython(self->container, self->iter->GetKey());
|
||||
|
||||
++(*self->iter);
|
||||
|
||||
@@ -969,8 +846,8 @@ PyObject* MapReflectionFriend::IterNext(PyObject* _self) {
|
||||
static void DeallocMapIterator(PyObject* _self) {
|
||||
MapIterator* self = GetIter(_self);
|
||||
self->iter.reset();
|
||||
self->owner.reset();
|
||||
Py_XDECREF(self->container);
|
||||
Py_CLEAR(self->container);
|
||||
Py_CLEAR(self->parent);
|
||||
Py_TYPE(_self)->tp_free(_self);
|
||||
}
|
||||
|
||||
@@ -1015,58 +892,32 @@ PyTypeObject MapIterator_Type = {
|
||||
|
||||
bool InitMapContainers() {
|
||||
// ScalarMapContainer_Type derives from our MutableMapping type.
|
||||
ScopedPyObjectPtr containers(PyImport_ImportModule(
|
||||
"google.protobuf.internal.containers"));
|
||||
if (containers == NULL) {
|
||||
ScopedPyObjectPtr abc(PyImport_ImportModule("collections.abc"));
|
||||
if (abc == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ScopedPyObjectPtr mutable_mapping(
|
||||
PyObject_GetAttrString(containers.get(), "MutableMapping"));
|
||||
PyObject_GetAttrString(abc.get(), "MutableMapping"));
|
||||
if (mutable_mapping == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!PyObject_TypeCheck(mutable_mapping.get(), &PyType_Type)) {
|
||||
Py_INCREF(mutable_mapping.get());
|
||||
ScopedPyObjectPtr bases(PyTuple_Pack(1, mutable_mapping.get()));
|
||||
if (bases == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Py_INCREF(mutable_mapping.get());
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
PyObject* bases = PyTuple_New(1);
|
||||
PyTuple_SET_ITEM(bases, 0, mutable_mapping.get());
|
||||
|
||||
ScalarMapContainer_Type = reinterpret_cast<PyTypeObject*>(
|
||||
PyType_FromSpecWithBases(&ScalarMapContainer_Type_spec, bases));
|
||||
#else
|
||||
_ScalarMapContainer_Type.tp_base =
|
||||
reinterpret_cast<PyTypeObject*>(mutable_mapping.get());
|
||||
|
||||
if (PyType_Ready(&_ScalarMapContainer_Type) < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ScalarMapContainer_Type = &_ScalarMapContainer_Type;
|
||||
#endif
|
||||
PyType_FromSpecWithBases(&ScalarMapContainer_Type_spec, bases.get()));
|
||||
|
||||
if (PyType_Ready(&MapIterator_Type) < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
MessageMapContainer_Type = reinterpret_cast<PyTypeObject*>(
|
||||
PyType_FromSpecWithBases(&MessageMapContainer_Type_spec, bases));
|
||||
#else
|
||||
Py_INCREF(mutable_mapping.get());
|
||||
_MessageMapContainer_Type.tp_base =
|
||||
reinterpret_cast<PyTypeObject*>(mutable_mapping.get());
|
||||
|
||||
if (PyType_Ready(&_MessageMapContainer_Type) < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
MessageMapContainer_Type = &_MessageMapContainer_Type;
|
||||
#endif
|
||||
PyType_FromSpecWithBases(&MessageMapContainer_Type_spec, bases.get()));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
@@ -50,55 +51,18 @@ struct CMessageClass;
|
||||
|
||||
// This struct is used directly for ScalarMap, and is the base class of
|
||||
// MessageMapContainer, which is used for MessageMap.
|
||||
struct MapContainer {
|
||||
PyObject_HEAD;
|
||||
|
||||
// This is the top-level C++ Message object that owns the whole
|
||||
// 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.
|
||||
CMessage::OwnerRef owner;
|
||||
|
||||
// Pointer to the C++ Message that contains this container. The
|
||||
// MapContainer does not own this pointer.
|
||||
const Message* message;
|
||||
|
||||
struct MapContainer : public ContainerBase {
|
||||
// Use to get a mutable message when necessary.
|
||||
Message* GetMutableMessage();
|
||||
|
||||
// Weak reference to a parent CMessage object (i.e. may be NULL.)
|
||||
//
|
||||
// Used to make sure all ancestors are also mutable when first
|
||||
// modifying the container.
|
||||
CMessage* parent;
|
||||
|
||||
// Pointer to the parent's descriptor that describes this
|
||||
// field. Used together with the parent's message when making a
|
||||
// default message instance mutable.
|
||||
// The pointer is owned by the global DescriptorPool.
|
||||
const FieldDescriptor* parent_field_descriptor;
|
||||
const FieldDescriptor* key_field_descriptor;
|
||||
const FieldDescriptor* value_field_descriptor;
|
||||
|
||||
// We bump this whenever we perform a mutation, to invalidate existing
|
||||
// iterators.
|
||||
uint64 version;
|
||||
|
||||
// Releases the messages in the container to a new message.
|
||||
//
|
||||
// Returns 0 on success, -1 on failure.
|
||||
int Release();
|
||||
|
||||
// Set the owner field of self and any children of self.
|
||||
void SetOwner(const CMessage::OwnerRef& new_owner) { owner = new_owner; }
|
||||
uint64_t version;
|
||||
};
|
||||
|
||||
struct MessageMapContainer : public MapContainer {
|
||||
// The type used to create new child messages.
|
||||
CMessageClass* message_class;
|
||||
|
||||
// A dict mapping Message* -> CMessage.
|
||||
PyObject* message_dict;
|
||||
};
|
||||
|
||||
bool InitMapContainers();
|
||||
@@ -109,17 +73,17 @@ extern PyTypeObject MapIterator_Type; // Both map types use the same iterator.
|
||||
|
||||
// Builds a MapContainer object, from a parent message and a
|
||||
// field descriptor.
|
||||
extern PyObject* NewScalarMapContainer(
|
||||
extern MapContainer* NewScalarMapContainer(
|
||||
CMessage* parent, const FieldDescriptor* parent_field_descriptor);
|
||||
|
||||
// Builds a MessageMap object, from a parent message and a
|
||||
// field descriptor.
|
||||
extern PyObject* NewMessageMapContainer(
|
||||
extern MessageMapContainer* NewMessageMapContainer(
|
||||
CMessage* parent, const FieldDescriptor* parent_field_descriptor,
|
||||
CMessageClass* message_class);
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
|
||||
File diff suppressed because it is too large.
Load diff
@@ -36,11 +36,12 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/pyext/thread_unsafe_shared_ptr.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -56,39 +57,51 @@ namespace python {
|
||||
|
||||
struct ExtensionDict;
|
||||
struct PyMessageFactory;
|
||||
struct CMessageClass;
|
||||
|
||||
typedef struct CMessage {
|
||||
// Most of the complexity of the Message class comes from the "Release"
|
||||
// behavior:
|
||||
//
|
||||
// When a field is cleared, it is only detached from its message. Existing
|
||||
// references to submessages, to repeated container etc. won't see any change,
|
||||
// as if the data was effectively managed by these containers.
|
||||
//
|
||||
// ExtensionDicts and UnknownFields containers do NOT follow this rule. They
|
||||
// don't store any data, and always refer to their parent message.
|
||||
|
||||
struct ContainerBase {
|
||||
PyObject_HEAD;
|
||||
|
||||
// This is the top-level C++ Message object that owns the whole
|
||||
// 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.
|
||||
|
||||
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
|
||||
// part of a repeated composite field).
|
||||
// Strong reference to a parent message object. For a CMessage there are three
|
||||
// cases:
|
||||
// - For a top-level message, this pointer is NULL.
|
||||
// - For a sub-message, this points to the parent message.
|
||||
// - For a message managed externally, this is a owned reference to Py_None.
|
||||
//
|
||||
// Used to make sure all ancestors are also mutable when first modifying
|
||||
// a child submessage (in other words, turning a default message instance
|
||||
// into a mutable one).
|
||||
//
|
||||
// If a submessage is released (becomes a new top-level message), this field
|
||||
// MUST be set to NULL. The parent may get deallocated and further attempts
|
||||
// to use this pointer will result in a crash.
|
||||
// For all other types: repeated containers, maps, it always point to a
|
||||
// valid parent CMessage.
|
||||
struct CMessage* parent;
|
||||
|
||||
// Pointer to the parent's descriptor that describes this submessage.
|
||||
// Used together with the parent's message when making a default message
|
||||
// instance mutable.
|
||||
// The pointer is owned by the global DescriptorPool.
|
||||
// If this object belongs to a parent message, describes which field it comes
|
||||
// from.
|
||||
// The pointer is owned by the DescriptorPool (which is kept alive
|
||||
// through the message's Python class)
|
||||
const FieldDescriptor* parent_field_descriptor;
|
||||
|
||||
// Pointer to the C++ Message object for this CMessage. The
|
||||
// CMessage does not own this pointer.
|
||||
PyObject* AsPyObject() { return reinterpret_cast<PyObject*>(this); }
|
||||
|
||||
// The Three methods below are only used by Repeated containers, and Maps.
|
||||
|
||||
// This implementation works for all containers which have a parent.
|
||||
PyObject* DeepCopy();
|
||||
// Delete this container object from its parent. Does not work for messages.
|
||||
void RemoveFromParentCache();
|
||||
};
|
||||
|
||||
typedef struct CMessage : public ContainerBase {
|
||||
// Pointer to the C++ Message object for this CMessage.
|
||||
// - If this object has no parent, we own this pointer.
|
||||
// - If this object has a parent message, the parent owns this pointer.
|
||||
Message* message;
|
||||
|
||||
// Indicates this submessage is pointing to a default instance of a message.
|
||||
@@ -96,26 +109,39 @@ typedef struct CMessage {
|
||||
// made writable, at which point this field is set to false.
|
||||
bool read_only;
|
||||
|
||||
// A reference to a Python dictionary containing CMessage,
|
||||
// RepeatedCompositeContainer, and RepeatedScalarContainer
|
||||
// objects. Used as a cache to make sure we don't have to make a
|
||||
// Python wrapper for the C++ Message objects on every access, or
|
||||
// deal with the synchronization nightmare that could create.
|
||||
PyObject* composite_fields;
|
||||
// A mapping indexed by field, containing weak references to contained objects
|
||||
// which need to implement the "Release" mechanism:
|
||||
// direct submessages, RepeatedCompositeContainer, RepeatedScalarContainer
|
||||
// and MapContainer.
|
||||
typedef std::unordered_map<const FieldDescriptor*, ContainerBase*>
|
||||
CompositeFieldsMap;
|
||||
CompositeFieldsMap* composite_fields;
|
||||
|
||||
// A reference to the dictionary containing the message's extensions.
|
||||
// Similar to composite_fields, acting as a cache, but also contains the
|
||||
// required extension dict logic.
|
||||
ExtensionDict* extensions;
|
||||
// A mapping containing weak references to indirect child messages, accessed
|
||||
// through containers: repeated messages, and values of message maps.
|
||||
// This avoid the creation of similar maps in each of those containers.
|
||||
typedef std::unordered_map<const Message*, CMessage*> SubMessagesMap;
|
||||
SubMessagesMap* child_submessages;
|
||||
|
||||
// A reference to PyUnknownFields.
|
||||
PyObject* unknown_field_set;
|
||||
|
||||
// Implements the "weakref" protocol for this object.
|
||||
PyObject* weakreflist;
|
||||
|
||||
// Return a *borrowed* reference to the message class.
|
||||
CMessageClass* GetMessageClass() {
|
||||
return reinterpret_cast<CMessageClass*>(Py_TYPE(this));
|
||||
}
|
||||
|
||||
// For container containing messages, return a Python object for the given
|
||||
// pointer to a message.
|
||||
CMessage* BuildSubMessageFromPointer(const FieldDescriptor* field_descriptor,
|
||||
Message* sub_message,
|
||||
CMessageClass* message_class);
|
||||
CMessage* MaybeReleaseSubMessage(Message* sub_message);
|
||||
} CMessage;
|
||||
|
||||
extern PyTypeObject CMessageClass_Type;
|
||||
extern PyTypeObject CMessage_Type;
|
||||
|
||||
|
||||
// The (meta) type of all Messages classes.
|
||||
// It allows us to cache some C++ pointers in the class object itself, they are
|
||||
// faster to extract than from the type's dictionary.
|
||||
@@ -129,12 +155,13 @@ struct CMessageClass {
|
||||
const Descriptor* message_descriptor;
|
||||
|
||||
// Owned reference, used to keep the pointer above alive.
|
||||
// This reference must stay alive until all message pointers are destructed.
|
||||
PyObject* py_message_descriptor;
|
||||
|
||||
// The Python MessageFactory used to create the class. It is needed to resolve
|
||||
// fields descriptors, including extensions fields; its C++ MessageFactory is
|
||||
// used to instantiate submessages.
|
||||
// We own the reference, because it's important to keep the factory alive.
|
||||
// This reference must stay alive until all message pointers are destructed.
|
||||
PyMessageFactory* py_message_factory;
|
||||
|
||||
PyObject* AsPyObject() {
|
||||
@@ -142,6 +169,8 @@ struct CMessageClass {
|
||||
}
|
||||
};
|
||||
|
||||
extern PyTypeObject* CMessageClass_Type;
|
||||
extern PyTypeObject* CMessage_Type;
|
||||
|
||||
namespace cmessage {
|
||||
|
||||
@@ -158,21 +187,16 @@ const FieldDescriptor* GetExtensionDescriptor(PyObject* extension);
|
||||
// submessage as the result is cached in composite_fields.
|
||||
//
|
||||
// Corresponds to reflection api method GetMessage.
|
||||
PyObject* InternalGetSubMessage(
|
||||
CMessage* InternalGetSubMessage(
|
||||
CMessage* self, const FieldDescriptor* field_descriptor);
|
||||
|
||||
// Deletes a range of C++ submessages in a repeated field (following a
|
||||
// Deletes a range of items in a repeated field (following a
|
||||
// removal in a RepeatedCompositeContainer).
|
||||
//
|
||||
// Releases messages to the provided cmessage_list if it is not NULL rather
|
||||
// than just removing them from the underlying proto. This cmessage_list must
|
||||
// have a CMessage for each underlying submessage. The CMessages referred to
|
||||
// by slice will be removed from cmessage_list by this function.
|
||||
//
|
||||
// Corresponds to reflection api method RemoveLast.
|
||||
int InternalDeleteRepeatedField(CMessage* self,
|
||||
const FieldDescriptor* field_descriptor,
|
||||
PyObject* slice, PyObject* cmessage_list);
|
||||
int DeleteRepeatedField(CMessage* self,
|
||||
const FieldDescriptor* field_descriptor,
|
||||
PyObject* slice);
|
||||
|
||||
// Sets the specified scalar value to the message.
|
||||
int InternalSetScalar(CMessage* self,
|
||||
@@ -190,34 +214,30 @@ int InternalSetNonOneofScalar(Message* message,
|
||||
PyObject* InternalGetScalar(const Message* message,
|
||||
const FieldDescriptor* field_descriptor);
|
||||
|
||||
bool SetCompositeField(CMessage* self, const FieldDescriptor* field,
|
||||
ContainerBase* value);
|
||||
|
||||
bool SetSubmessage(CMessage* self, CMessage* submessage);
|
||||
|
||||
// Clears the message, removing all contained data. Extension dictionary and
|
||||
// submessages are released first if there are remaining external references.
|
||||
//
|
||||
// Corresponds to message api method Clear.
|
||||
PyObject* Clear(CMessage* self);
|
||||
|
||||
// Clears the data described by the given descriptor. Used to clear extensions
|
||||
// (which don't have names). Extension release is handled by ExtensionDict
|
||||
// class, not this function.
|
||||
// TODO(anuraag): Try to make this discrepancy in release semantics with
|
||||
// ClearField less confusing.
|
||||
// Clears the data described by the given descriptor.
|
||||
// Returns -1 on error.
|
||||
//
|
||||
// Corresponds to reflection api method ClearField.
|
||||
PyObject* ClearFieldByDescriptor(
|
||||
CMessage* self, const FieldDescriptor* descriptor);
|
||||
|
||||
// Clears the data for the given field name. The message is released if there
|
||||
// are any external references.
|
||||
//
|
||||
// Corresponds to reflection api method ClearField.
|
||||
PyObject* ClearField(CMessage* self, PyObject* arg);
|
||||
int ClearFieldByDescriptor(CMessage* self, const FieldDescriptor* descriptor);
|
||||
|
||||
// Checks if the message has the field described by the descriptor. Used for
|
||||
// extensions (which have no name).
|
||||
// Returns 1 if true, 0 if false, and -1 on error.
|
||||
//
|
||||
// Corresponds to reflection api method HasField
|
||||
PyObject* HasFieldByDescriptor(
|
||||
CMessage* self, const FieldDescriptor* field_descriptor);
|
||||
int HasFieldByDescriptor(CMessage* self,
|
||||
const FieldDescriptor* field_descriptor);
|
||||
|
||||
// Checks if the message has the named field.
|
||||
//
|
||||
@@ -235,23 +255,16 @@ 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 'self', which is interpreted as a
|
||||
// CMessage. Returns the attribute value on success, or null on failure.
|
||||
//
|
||||
// Returns a new reference.
|
||||
PyObject* GetAttr(PyObject* self, PyObject* name);
|
||||
|
||||
// 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);
|
||||
// Get a field from a message.
|
||||
PyObject* GetFieldValue(CMessage* self,
|
||||
const FieldDescriptor* field_descriptor);
|
||||
// Sets the value of a scalar field in a message.
|
||||
// On error, return -1 with an extension set.
|
||||
int SetFieldValue(CMessage* self, const FieldDescriptor* field_descriptor,
|
||||
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 CMessage::OwnerRef& new_owner);
|
||||
|
||||
int AssureWritable(CMessage* self);
|
||||
|
||||
// Returns the message factory for the given message.
|
||||
@@ -270,55 +283,54 @@ PyObject* SetAllowOversizeProtos(PyObject* m, PyObject* arg);
|
||||
/* Is 64bit */
|
||||
#define IS_64BIT (SIZEOF_LONG == 8)
|
||||
|
||||
#define FIELD_IS_REPEATED(field_descriptor) \
|
||||
((field_descriptor)->label() == FieldDescriptor::LABEL_REPEATED)
|
||||
#define FIELD_IS_REPEATED(field_descriptor) \
|
||||
((field_descriptor)->label() == FieldDescriptor::LABEL_REPEATED)
|
||||
|
||||
#define GOOGLE_CHECK_GET_INT32(arg, value, err) \
|
||||
int32 value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
#define GOOGLE_CHECK_GET_INT32(arg, value, err) \
|
||||
int32_t value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_INT64(arg, value, err) \
|
||||
int64 value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
#define GOOGLE_CHECK_GET_INT64(arg, value, err) \
|
||||
int64_t value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_UINT32(arg, value, err) \
|
||||
uint32 value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
#define GOOGLE_CHECK_GET_UINT32(arg, value, err) \
|
||||
uint32_t value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_UINT64(arg, value, err) \
|
||||
uint64 value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
#define GOOGLE_CHECK_GET_UINT64(arg, value, err) \
|
||||
uint64_t value; \
|
||||
if (!CheckAndGetInteger(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_FLOAT(arg, value, err) \
|
||||
float value; \
|
||||
if (!CheckAndGetFloat(arg, &value)) { \
|
||||
return err; \
|
||||
} \
|
||||
#define GOOGLE_CHECK_GET_FLOAT(arg, value, err) \
|
||||
float value; \
|
||||
if (!CheckAndGetFloat(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_DOUBLE(arg, value, err) \
|
||||
double value; \
|
||||
if (!CheckAndGetDouble(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_BOOL(arg, value, err) \
|
||||
bool value; \
|
||||
if (!CheckAndGetBool(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
#define GOOGLE_CHECK_GET_DOUBLE(arg, value, err) \
|
||||
double value; \
|
||||
if (!CheckAndGetDouble(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define GOOGLE_CHECK_GET_BOOL(arg, value, err) \
|
||||
bool value; \
|
||||
if (!CheckAndGetBool(arg, &value)) { \
|
||||
return err; \
|
||||
}
|
||||
|
||||
#define FULL_MODULE_NAME "google.protobuf.pyext._message"
|
||||
|
||||
void FormatTypeError(PyObject* arg, char* expected_types);
|
||||
void FormatTypeError(PyObject* arg, const char* expected_types);
|
||||
template<class T>
|
||||
bool CheckAndGetInteger(PyObject* arg, T* value);
|
||||
bool CheckAndGetDouble(PyObject* arg, double* value);
|
||||
@@ -332,7 +344,7 @@ bool CheckAndSetString(
|
||||
bool append,
|
||||
int index);
|
||||
PyObject* ToStringObject(const FieldDescriptor* descriptor,
|
||||
const string& value);
|
||||
const std::string& value);
|
||||
|
||||
// Check if the passed field descriptor belongs to the given message.
|
||||
// If not, return false and set a Python exception (a KeyError)
|
||||
@@ -341,19 +353,24 @@ bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor,
|
||||
|
||||
extern PyObject* PickleError_class;
|
||||
|
||||
PyObject* PyMessage_New(const Descriptor* descriptor,
|
||||
PyObject* py_message_factory);
|
||||
const Message* PyMessage_GetMessagePointer(PyObject* msg);
|
||||
Message* PyMessage_GetMutableMessagePointer(PyObject* msg);
|
||||
PyObject* PyMessage_NewMessageOwnedExternally(Message* message,
|
||||
PyObject* py_message_factory);
|
||||
|
||||
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
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_H__
|
||||
@@ -28,6 +28,8 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
@@ -36,15 +38,12 @@
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
#if PY_VERSION_HEX < 0x03030000
|
||||
#error "Python 3.0 - 3.2 are not supported."
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob)? \
|
||||
((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
||||
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
#endif
|
||||
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
||||
(PyUnicode_Check(ob) ? ((*(charpp) = const_cast<char*>( \
|
||||
PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL \
|
||||
? -1 \
|
||||
: 0) \
|
||||
: PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -65,9 +64,7 @@ PyMessageFactory* NewMessageFactory(PyTypeObject* type, PyDescriptorPool* pool)
|
||||
factory->message_factory = message_factory;
|
||||
|
||||
factory->pool = pool;
|
||||
// TODO(amauryfa): When the MessageFactory is not created from the
|
||||
// DescriptorPool this reference should be owned, not borrowed.
|
||||
// Py_INCREF(pool);
|
||||
Py_INCREF(pool);
|
||||
|
||||
factory->classes_by_descriptor = new PyMessageFactory::ClassesByMessageMap();
|
||||
|
||||
@@ -75,9 +72,10 @@ PyMessageFactory* NewMessageFactory(PyTypeObject* type, PyDescriptorPool* pool)
|
||||
}
|
||||
|
||||
PyObject* New(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
|
||||
static char* kwlist[] = {"pool", 0};
|
||||
static const char* kwlist[] = {"pool", 0};
|
||||
PyObject* pool = NULL;
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", kwlist, &pool)) {
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O",
|
||||
const_cast<char**>(kwlist), &pool)) {
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr owned_pool;
|
||||
@@ -103,19 +101,37 @@ PyObject* New(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
|
||||
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);
|
||||
typedef PyMessageFactory::ClassesByMessageMap::iterator iterator;
|
||||
for (iterator it = self->classes_by_descriptor->begin();
|
||||
it != self->classes_by_descriptor->end(); ++it) {
|
||||
Py_DECREF(it->second);
|
||||
Py_CLEAR(it->second);
|
||||
}
|
||||
delete self->classes_by_descriptor;
|
||||
delete self->message_factory;
|
||||
Py_CLEAR(self->pool);
|
||||
Py_TYPE(self)->tp_free(pself);
|
||||
}
|
||||
|
||||
static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
|
||||
PyMessageFactory* self = reinterpret_cast<PyMessageFactory*>(pself);
|
||||
Py_VISIT(self->pool);
|
||||
for (const auto& desc_and_class : *self->classes_by_descriptor) {
|
||||
Py_VISIT(desc_and_class.second);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int GcClear(PyObject* pself) {
|
||||
PyMessageFactory* self = reinterpret_cast<PyMessageFactory*>(pself);
|
||||
// Here it's important to not clear self->pool, so that the C++ DescriptorPool
|
||||
// is still alive when self->message_factory is destructed.
|
||||
for (auto& desc_and_class : *self->classes_by_descriptor) {
|
||||
Py_CLEAR(desc_and_class.second);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Add a message class to our database.
|
||||
int RegisterMessageClass(PyMessageFactory* self,
|
||||
const Descriptor* message_descriptor,
|
||||
@@ -137,7 +153,7 @@ CMessageClass* GetOrCreateMessageClass(PyMessageFactory* self,
|
||||
// This is the same implementation as MessageFactory.GetPrototype().
|
||||
|
||||
// Do not create a MessageClass that already exists.
|
||||
hash_map<const Descriptor*, CMessageClass*>::iterator it =
|
||||
std::unordered_map<const Descriptor*, CMessageClass*>::iterator it =
|
||||
self->classes_by_descriptor->find(descriptor);
|
||||
if (it != self->classes_by_descriptor->end()) {
|
||||
Py_INCREF(it->second);
|
||||
@@ -158,7 +174,7 @@ CMessageClass* GetOrCreateMessageClass(PyMessageFactory* self,
|
||||
return NULL;
|
||||
}
|
||||
ScopedPyObjectPtr message_class(PyObject_CallObject(
|
||||
reinterpret_cast<PyObject*>(&CMessageClass_Type), args.get()));
|
||||
reinterpret_cast<PyObject*>(CMessageClass_Type), args.get()));
|
||||
if (message_class == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -230,44 +246,44 @@ static PyGetSetDef Getters[] = {
|
||||
|
||||
PyTypeObject PyMessageFactory_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
|
||||
".MessageFactory", // tp_name
|
||||
sizeof(PyMessageFactory), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
message_factory::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, // tp_flags
|
||||
"A static Message Factory", // tp_doc
|
||||
0, // tp_traverse
|
||||
0, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
message_factory::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
message_factory::Getters, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
message_factory::New, // tp_new
|
||||
PyObject_Del, // tp_free
|
||||
".MessageFactory", // tp_name
|
||||
sizeof(PyMessageFactory), // tp_basicsize
|
||||
0, // tp_itemsize
|
||||
message_factory::Dealloc, // tp_dealloc
|
||||
0, // tp_print
|
||||
0, // tp_getattr
|
||||
0, // tp_setattr
|
||||
0, // tp_compare
|
||||
0, // tp_repr
|
||||
0, // tp_as_number
|
||||
0, // tp_as_sequence
|
||||
0, // tp_as_mapping
|
||||
0, // tp_hash
|
||||
0, // tp_call
|
||||
0, // tp_str
|
||||
0, // tp_getattro
|
||||
0, // tp_setattro
|
||||
0, // tp_as_buffer
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, // tp_flags
|
||||
"A static Message Factory", // tp_doc
|
||||
message_factory::GcTraverse, // tp_traverse
|
||||
message_factory::GcClear, // tp_clear
|
||||
0, // tp_richcompare
|
||||
0, // tp_weaklistoffset
|
||||
0, // tp_iter
|
||||
0, // tp_iternext
|
||||
message_factory::Methods, // tp_methods
|
||||
0, // tp_members
|
||||
message_factory::Getters, // tp_getset
|
||||
0, // tp_base
|
||||
0, // tp_dict
|
||||
0, // tp_descr_get
|
||||
0, // tp_descr_set
|
||||
0, // tp_dictoffset
|
||||
0, // tp_init
|
||||
0, // tp_alloc
|
||||
message_factory::New, // tp_new
|
||||
PyObject_GC_Del, // tp_free
|
||||
};
|
||||
|
||||
bool InitMessageFactory() {
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <unordered_map>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/pyext/descriptor_pool.h>
|
||||
|
||||
@@ -57,16 +57,16 @@ struct PyMessageFactory {
|
||||
// The C++ one creates messages, when the Python one creates classes.
|
||||
MessageFactory* message_factory;
|
||||
|
||||
// borrowed reference to a Python DescriptorPool.
|
||||
// TODO(amauryfa): invert the dependency: the MessageFactory owns the
|
||||
// DescriptorPool, not the opposite.
|
||||
// Owned reference to a Python DescriptorPool.
|
||||
// This reference must stay until the message_factory is destructed.
|
||||
PyDescriptorPool* pool;
|
||||
|
||||
// Make our own mapping to retrieve Python classes from C++ descriptors.
|
||||
//
|
||||
// Descriptor pointers stored here are owned by the DescriptorPool above.
|
||||
// Python references to classes are owned by this PyDescriptorPool.
|
||||
typedef hash_map<const Descriptor*, CMessageClass*> ClassesByMessageMap;
|
||||
typedef std::unordered_map<const Descriptor*, CMessageClass*>
|
||||
ClassesByMessageMap;
|
||||
ClassesByMessageMap* classes_by_descriptor;
|
||||
};
|
||||
|
||||
@@ -98,6 +98,6 @@ bool InitMessageFactory();
|
||||
|
||||
} // namespace python
|
||||
} // namespace protobuf
|
||||
|
||||
} // namespace google
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_FACTORY_H__
|
||||
@@ -30,92 +30,104 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
|
||||
#include <google/protobuf/message_lite.h>
|
||||
#include <google/protobuf/pyext/descriptor.h>
|
||||
#include <google/protobuf/pyext/descriptor_pool.h>
|
||||
#include <google/protobuf/pyext/message.h>
|
||||
#include <google/protobuf/pyext/message_factory.h>
|
||||
#include <google/protobuf/proto_api.h>
|
||||
|
||||
static PyObject* GetPythonProto3PreserveUnknownsDefault(
|
||||
PyObject* /*m*/, PyObject* /*args*/) {
|
||||
if (google::protobuf::internal::GetProto3PreserveUnknownsDefault()) {
|
||||
Py_RETURN_TRUE;
|
||||
} else {
|
||||
Py_RETURN_FALSE;
|
||||
}
|
||||
}
|
||||
namespace {
|
||||
|
||||
static PyObject* SetPythonProto3PreserveUnknownsDefault(
|
||||
PyObject* /*m*/, PyObject* arg) {
|
||||
if (!arg || !PyBool_Check(arg)) {
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError,
|
||||
"Argument to SetPythonProto3PreserveUnknownsDefault must be boolean");
|
||||
return NULL;
|
||||
// C++ API. Clients get at this via proto_api.h
|
||||
struct ApiImplementation : google::protobuf::python::PyProto_API {
|
||||
const google::protobuf::Message* GetMessagePointer(PyObject* msg) const override {
|
||||
return google::protobuf::python::PyMessage_GetMessagePointer(msg);
|
||||
}
|
||||
google::protobuf::internal::SetProto3PreserveUnknownsDefault(PyObject_IsTrue(arg));
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
google::protobuf::Message* GetMutableMessagePointer(PyObject* msg) const override {
|
||||
return google::protobuf::python::PyMessage_GetMutableMessagePointer(msg);
|
||||
}
|
||||
const google::protobuf::Descriptor* MessageDescriptor_AsDescriptor(
|
||||
PyObject* desc) const override {
|
||||
return google::protobuf::python::PyMessageDescriptor_AsDescriptor(desc);
|
||||
}
|
||||
const google::protobuf::EnumDescriptor* EnumDescriptor_AsDescriptor(
|
||||
PyObject* enum_desc) const override {
|
||||
return google::protobuf::python::PyEnumDescriptor_AsDescriptor(enum_desc);
|
||||
}
|
||||
|
||||
const google::protobuf::DescriptorPool* GetDefaultDescriptorPool() const override {
|
||||
return google::protobuf::python::GetDefaultDescriptorPool()->pool;
|
||||
}
|
||||
|
||||
google::protobuf::MessageFactory* GetDefaultMessageFactory() const override {
|
||||
return google::protobuf::python::GetDefaultDescriptorPool()
|
||||
->py_message_factory->message_factory;
|
||||
}
|
||||
PyObject* NewMessage(const google::protobuf::Descriptor* descriptor,
|
||||
PyObject* py_message_factory) const override {
|
||||
return google::protobuf::python::PyMessage_New(descriptor, py_message_factory);
|
||||
}
|
||||
PyObject* NewMessageOwnedExternally(
|
||||
google::protobuf::Message* msg, PyObject* py_message_factory) const override {
|
||||
return google::protobuf::python::PyMessage_NewMessageOwnedExternally(
|
||||
msg, py_message_factory);
|
||||
}
|
||||
PyObject* DescriptorPool_FromPool(
|
||||
const google::protobuf::DescriptorPool* pool) const override {
|
||||
return google::protobuf::python::PyDescriptorPool_FromPool(pool);
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
static const char module_docstring[] =
|
||||
"python-proto2 is a module that can be used to enhance proto2 Python API\n"
|
||||
"performance.\n"
|
||||
"\n"
|
||||
"It provides access to the protocol buffers C++ reflection API that\n"
|
||||
"implements the basic protocol buffer functions.";
|
||||
"python-proto2 is a module that can be used to enhance proto2 Python API\n"
|
||||
"performance.\n"
|
||||
"\n"
|
||||
"It provides access to the protocol buffers C++ reflection API that\n"
|
||||
"implements the basic protocol buffer functions.";
|
||||
|
||||
static PyMethodDef ModuleMethods[] = {
|
||||
{"SetAllowOversizeProtos",
|
||||
(PyCFunction)google::protobuf::python::cmessage::SetAllowOversizeProtos,
|
||||
METH_O, "Enable/disable oversize proto parsing."},
|
||||
// DO NOT USE: For migration and testing only.
|
||||
{"GetPythonProto3PreserveUnknownsDefault",
|
||||
(PyCFunction)GetPythonProto3PreserveUnknownsDefault,
|
||||
METH_NOARGS, "Get Proto3 preserve unknowns default."},
|
||||
// DO NOT USE: For migration and testing only.
|
||||
{"SetPythonProto3PreserveUnknownsDefault",
|
||||
(PyCFunction)SetPythonProto3PreserveUnknownsDefault,
|
||||
METH_O, "Enable/disable proto3 unknowns preservation."},
|
||||
{ NULL, NULL}
|
||||
};
|
||||
{"SetAllowOversizeProtos",
|
||||
(PyCFunction)google::protobuf::python::cmessage::SetAllowOversizeProtos, METH_O,
|
||||
"Enable/disable oversize proto parsing."},
|
||||
// DO NOT USE: For migration and testing only.
|
||||
{NULL, NULL}};
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
static struct PyModuleDef _module = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"_message",
|
||||
module_docstring,
|
||||
-1,
|
||||
ModuleMethods, /* m_methods */
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
#define INITFUNC PyInit__message
|
||||
#define INITFUNC_ERRORVAL NULL
|
||||
#else // Python 2
|
||||
#define INITFUNC init_message
|
||||
#define INITFUNC_ERRORVAL
|
||||
#endif
|
||||
static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT,
|
||||
"_message",
|
||||
module_docstring,
|
||||
-1,
|
||||
ModuleMethods, /* m_methods */
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL};
|
||||
|
||||
extern "C" {
|
||||
PyMODINIT_FUNC INITFUNC(void) {
|
||||
PyObject* m;
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
m = PyModule_Create(&_module);
|
||||
#else
|
||||
m = Py_InitModule3("_message", ModuleMethods,
|
||||
module_docstring);
|
||||
#endif
|
||||
if (m == NULL) {
|
||||
return INITFUNC_ERRORVAL;
|
||||
}
|
||||
|
||||
if (!google::protobuf::python::InitProto2MessageModule(m)) {
|
||||
Py_DECREF(m);
|
||||
return INITFUNC_ERRORVAL;
|
||||
}
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
return m;
|
||||
#endif
|
||||
PyMODINIT_FUNC PyInit__message() {
|
||||
PyObject* m;
|
||||
m = PyModule_Create(&_module);
|
||||
if (m == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!google::protobuf::python::InitProto2MessageModule(m)) {
|
||||
Py_DECREF(m);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Adds the C++ API
|
||||
if (PyObject* api = PyCapsule_New(
|
||||
new ApiImplementation(), google::protobuf::python::PyProtoAPICapsuleName(),
|
||||
[](PyObject* o) {
|
||||
delete (ApiImplementation*)PyCapsule_GetPointer(
|
||||
o, google::protobuf::python::PyProtoAPICapsuleName());
|
||||
})) {
|
||||
PyModule_AddObject(m, "proto_API", api);
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return m;
|
||||
}
|
||||
@@ -30,10 +30,10 @@
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
import "google/protobuf/internal/cpp/proto1_api_test.proto";
|
||||
|
||||
package google.protobuf.python.internal;
|
||||
|
||||
import "google/protobuf/internal/cpp/proto1_api_test.proto";
|
||||
|
||||
message TestNestedProto1APIMessage {
|
||||
optional int32 a = 1;
|
||||
optional TestMessage.NestedMessage b = 2;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
# source: google/protobuf/pyext/python.proto
|
||||
|
||||
import sys
|
||||
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
||||
"""Generated protocol buffer code."""
|
||||
from google.protobuf import descriptor as _descriptor
|
||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||
from google.protobuf import message as _message
|
||||
from google.protobuf import reflection as _reflection
|
||||
from google.protobuf import symbol_database as _symbol_database
|
||||
@@ -14,220 +14,59 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
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')
|
||||
)
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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')
|
||||
|
||||
|
||||
OPTIONAL_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER = 1
|
||||
optional_nested_message_extension = _descriptor.FieldDescriptor(
|
||||
name='optional_nested_message_extension', full_name='google.protobuf.python.internal.optional_nested_message_extension', index=0,
|
||||
number=1, 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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
optional_nested_message_extension = DESCRIPTOR.extensions_by_name['optional_nested_message_extension']
|
||||
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,
|
||||
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=True, extension_scope=None,
|
||||
serialized_options=None, file=DESCRIPTOR)
|
||||
repeated_nested_message_extension = DESCRIPTOR.extensions_by_name['repeated_nested_message_extension']
|
||||
|
||||
_TESTALLTYPES = DESCRIPTOR.message_types_by_name['TestAllTypes']
|
||||
_TESTALLTYPES_NESTEDMESSAGE = _TESTALLTYPES.nested_types_by_name['NestedMessage']
|
||||
_FOREIGNMESSAGE = DESCRIPTOR.message_types_by_name['ForeignMessage']
|
||||
_TESTALLEXTENSIONS = DESCRIPTOR.message_types_by_name['TestAllExtensions']
|
||||
TestAllTypes = _reflection.GeneratedProtocolMessageType('TestAllTypes', (_message.Message,), {
|
||||
|
||||
_TESTALLTYPES_NESTEDMESSAGE = _descriptor.Descriptor(
|
||||
name='NestedMessage',
|
||||
full_name='google.protobuf.python.internal.TestAllTypes.NestedMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='bb', full_name='google.protobuf.python.internal.TestAllTypes.NestedMessage.bb', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=300,
|
||||
serialized_end=388,
|
||||
)
|
||||
|
||||
_TESTALLTYPES = _descriptor.Descriptor(
|
||||
name='TestAllTypes',
|
||||
full_name='google.protobuf.python.internal.TestAllTypes',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='repeated_nested_message', full_name='google.protobuf.python.internal.TestAllTypes.repeated_nested_message', index=0,
|
||||
number=1, 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,
|
||||
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,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[_TESTALLTYPES_NESTEDMESSAGE, ],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=72,
|
||||
serialized_end=388,
|
||||
)
|
||||
|
||||
|
||||
_FOREIGNMESSAGE = _descriptor.Descriptor(
|
||||
name='ForeignMessage',
|
||||
full_name='google.protobuf.python.internal.ForeignMessage',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
_descriptor.FieldDescriptor(
|
||||
name='c', full_name='google.protobuf.python.internal.ForeignMessage.c', index=0,
|
||||
number=1, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
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,
|
||||
serialized_options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=False,
|
||||
syntax='proto2',
|
||||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=390,
|
||||
serialized_end=428,
|
||||
)
|
||||
|
||||
|
||||
_TESTALLEXTENSIONS = _descriptor.Descriptor(
|
||||
name='TestAllExtensions',
|
||||
full_name='google.protobuf.python.internal.TestAllExtensions',
|
||||
filename=None,
|
||||
file=DESCRIPTOR,
|
||||
containing_type=None,
|
||||
fields=[
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
nested_types=[],
|
||||
enum_types=[
|
||||
],
|
||||
serialized_options=None,
|
||||
is_extendable=True,
|
||||
syntax='proto2',
|
||||
extension_ranges=[(1, 536870912), ],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=430,
|
||||
serialized_end=459,
|
||||
)
|
||||
|
||||
_TESTALLTYPES_NESTEDMESSAGE.fields_by_name['cc'].message_type = _FOREIGNMESSAGE
|
||||
_TESTALLTYPES_NESTEDMESSAGE.containing_type = _TESTALLTYPES
|
||||
_TESTALLTYPES.fields_by_name['repeated_nested_message'].message_type = _TESTALLTYPES_NESTEDMESSAGE
|
||||
_TESTALLTYPES.fields_by_name['optional_nested_message'].message_type = _TESTALLTYPES_NESTEDMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['TestAllTypes'] = _TESTALLTYPES
|
||||
DESCRIPTOR.message_types_by_name['ForeignMessage'] = _FOREIGNMESSAGE
|
||||
DESCRIPTOR.message_types_by_name['TestAllExtensions'] = _TESTALLEXTENSIONS
|
||||
DESCRIPTOR.extensions_by_name['optional_nested_message_extension'] = optional_nested_message_extension
|
||||
DESCRIPTOR.extensions_by_name['repeated_nested_message_extension'] = repeated_nested_message_extension
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
TestAllTypes = _reflection.GeneratedProtocolMessageType('TestAllTypes', (_message.Message,), dict(
|
||||
|
||||
NestedMessage = _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTALLTYPES_NESTEDMESSAGE,
|
||||
__module__ = 'google.protobuf.pyext.python_pb2'
|
||||
'NestedMessage' : _reflection.GeneratedProtocolMessageType('NestedMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTALLTYPES_NESTEDMESSAGE,
|
||||
'__module__' : 'google.protobuf.pyext.python_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestAllTypes.NestedMessage)
|
||||
))
|
||||
})
|
||||
,
|
||||
DESCRIPTOR = _TESTALLTYPES,
|
||||
__module__ = 'google.protobuf.pyext.python_pb2'
|
||||
'DESCRIPTOR' : _TESTALLTYPES,
|
||||
'__module__' : 'google.protobuf.pyext.python_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestAllTypes)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestAllTypes)
|
||||
_sym_db.RegisterMessage(TestAllTypes.NestedMessage)
|
||||
|
||||
ForeignMessage = _reflection.GeneratedProtocolMessageType('ForeignMessage', (_message.Message,), dict(
|
||||
DESCRIPTOR = _FOREIGNMESSAGE,
|
||||
__module__ = 'google.protobuf.pyext.python_pb2'
|
||||
ForeignMessage = _reflection.GeneratedProtocolMessageType('ForeignMessage', (_message.Message,), {
|
||||
'DESCRIPTOR' : _FOREIGNMESSAGE,
|
||||
'__module__' : 'google.protobuf.pyext.python_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.ForeignMessage)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(ForeignMessage)
|
||||
|
||||
TestAllExtensions = _reflection.GeneratedProtocolMessageType('TestAllExtensions', (_message.Message,), dict(
|
||||
DESCRIPTOR = _TESTALLEXTENSIONS,
|
||||
__module__ = 'google.protobuf.pyext.python_pb2'
|
||||
TestAllExtensions = _reflection.GeneratedProtocolMessageType('TestAllExtensions', (_message.Message,), {
|
||||
'DESCRIPTOR' : _TESTALLEXTENSIONS,
|
||||
'__module__' : 'google.protobuf.pyext.python_pb2'
|
||||
# @@protoc_insertion_point(class_scope:google.protobuf.python.internal.TestAllExtensions)
|
||||
))
|
||||
})
|
||||
_sym_db.RegisterMessage(TestAllExtensions)
|
||||
|
||||
optional_nested_message_extension.message_type = _TESTALLTYPES_NESTEDMESSAGE
|
||||
TestAllExtensions.RegisterExtension(optional_nested_message_extension)
|
||||
repeated_nested_message_extension.message_type = _TESTALLTYPES_NESTEDMESSAGE
|
||||
TestAllExtensions.RegisterExtension(repeated_nested_message_extension)
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
TestAllExtensions.RegisterExtension(optional_nested_message_extension)
|
||||
TestAllExtensions.RegisterExtension(repeated_nested_message_extension)
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._options = None
|
||||
DESCRIPTOR._serialized_options = b'H\001'
|
||||
_TESTALLTYPES._serialized_start=72
|
||||
_TESTALLTYPES._serialized_end=388
|
||||
_TESTALLTYPES_NESTEDMESSAGE._serialized_start=300
|
||||
_TESTALLTYPES_NESTEDMESSAGE._serialized_end=388
|
||||
_FOREIGNMESSAGE._serialized_start=390
|
||||
_FOREIGNMESSAGE._serialized_end=428
|
||||
_TESTALLEXTENSIONS._serialized_start=430
|
||||
_TESTALLEXTENSIONS._serialized_end=459
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
Loaded 100 of 689 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user