From 8ad347ff7c94521ec5cc9e7a6c578d335fd676a5 Mon Sep 17 00:00:00 2001 From: Spencer Nelson Date: Fri, 10 Aug 2018 10:41:19 -0700 Subject: [PATCH] Version 5.4.2 --- .../clientcompat/clientcompat.twirp.go | 8 ++--- clientcompat/pycompat/clientcompat_pb2.py | 35 ++++++++++--------- .../pycompat/clientcompat_pb2_twirp.py | 2 +- example/service.twirp.go | 8 ++--- example/service_pb2.py | 21 +++++------ example/service_pb2_twirp.py | 2 +- internal/gen/version.go | 2 +- .../twirptest/gogo_compat/service.twirp.go | 8 ++--- .../google_protobuf_imports/service.twirp.go | 8 ++--- .../google_protobuf_imports/service_pb2.py | 9 ++--- .../service_pb2_twirp.py | 2 +- .../twirptest/importable/importable.twirp.go | 8 ++--- .../twirptest/importable/importable_pb2.py | 11 +++--- .../importable/importable_pb2_twirp.py | 2 +- internal/twirptest/importer/importer.twirp.go | 8 ++--- internal/twirptest/importer/importer_pb2.py | 9 ++--- .../twirptest/importer/importer_pb2_twirp.py | 2 +- internal/twirptest/importmapping/x/x.twirp.go | 8 ++--- internal/twirptest/importmapping/x/x_pb2.py | 9 ++--- .../twirptest/importmapping/x/x_pb2_twirp.py | 2 +- internal/twirptest/importmapping/y/y_pb2.py | 4 +-- .../twirptest/importmapping/y/y_pb2_twirp.py | 2 +- .../twirptest/multiple/multiple1.twirp.go | 8 ++--- internal/twirptest/multiple/multiple1_pb2.py | 11 +++--- .../twirptest/multiple/multiple1_pb2_twirp.py | 2 +- .../twirptest/multiple/multiple2.twirp.go | 4 +-- internal/twirptest/multiple/multiple2_pb2.py | 13 +++---- .../twirptest/multiple/multiple2_pb2_twirp.py | 2 +- .../no_package_name/no_package_name.twirp.go | 8 ++--- .../no_package_name/no_package_name_pb2.py | 11 +++--- .../no_package_name_pb2_twirp.py | 2 +- .../no_package_name_importer.twirp.go | 8 ++--- .../no_package_name_importer_pb2.py | 9 ++--- .../no_package_name_importer_pb2_twirp.py | 2 +- internal/twirptest/proto/proto.twirp.go | 8 ++--- internal/twirptest/proto/proto_pb2.py | 11 +++--- internal/twirptest/proto/proto_pb2_twirp.py | 2 +- internal/twirptest/service.twirp.go | 8 ++--- .../service_method_same_name.twirp.go | 8 ++--- .../service_method_same_name_pb2.py | 11 +++--- .../service_method_same_name_pb2_twirp.py | 2 +- internal/twirptest/service_pb2.py | 21 +++++------ internal/twirptest/service_pb2_twirp.py | 2 +- 43 files changed, 168 insertions(+), 155 deletions(-) diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go index 705cf9e1..2be46097 100644 --- a/clientcompat/internal/clientcompat/clientcompat.twirp.go +++ b/clientcompat/internal/clientcompat/clientcompat.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: clientcompat.proto /* Package clientcompat is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: clientcompat.proto @@ -499,7 +499,7 @@ func (s *compatServiceServer) ServiceDescriptor() ([]byte, int) { } func (s *compatServiceServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -629,7 +629,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/clientcompat/pycompat/clientcompat_pb2.py b/clientcompat/pycompat/clientcompat_pb2.py index 1f6f6ee7..4faf856a 100644 --- a/clientcompat/pycompat/clientcompat_pb2.py +++ b/clientcompat/pycompat/clientcompat_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='clientcompat.proto', package='twirp.clientcompat', syntax='proto3', - serialized_options=_b('Z\014clientcompat'), serialized_pb=_b('\n\x12\x63lientcompat.proto\x12\x12twirp.clientcompat\"\x07\n\x05\x45mpty\"\x10\n\x03Req\x12\t\n\x01v\x18\x01 \x01(\t\"\x11\n\x04Resp\x12\t\n\x01v\x18\x01 \x01(\x05\"\xb9\x01\n\x13\x43lientCompatMessage\x12\x17\n\x0fservice_address\x18\x01 \x01(\t\x12K\n\x06method\x18\x02 \x01(\x0e\x32;.twirp.clientcompat.ClientCompatMessage.CompatServiceMethod\x12\x0f\n\x07request\x18\x03 \x01(\x0c\"+\n\x13\x43ompatServiceMethod\x12\x08\n\x04NOOP\x10\x00\x12\n\n\x06METHOD\x10\x01\x32\x90\x01\n\rCompatService\x12;\n\x06Method\x12\x17.twirp.clientcompat.Req\x1a\x18.twirp.clientcompat.Resp\x12\x42\n\nNoopMethod\x12\x19.twirp.clientcompat.Empty\x1a\x19.twirp.clientcompat.EmptyB\x0eZ\x0c\x63lientcompatb\x06proto3') ) @@ -32,15 +32,15 @@ values=[ _descriptor.EnumValueDescriptor( name='NOOP', index=0, number=0, - serialized_options=None, + options=None, type=None), _descriptor.EnumValueDescriptor( name='METHOD', index=1, number=1, - serialized_options=None, + options=None, type=None), ], containing_type=None, - serialized_options=None, + options=None, serialized_start=231, serialized_end=274, ) @@ -60,7 +60,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -84,14 +84,14 @@ 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -115,14 +115,14 @@ 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -146,21 +146,21 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='method', full_name='twirp.clientcompat.ClientCompatMessage.method', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='request', full_name='twirp.clientcompat.ClientCompatMessage.request', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -168,7 +168,7 @@ enum_types=[ _CLIENTCOMPATMESSAGE_COMPATSERVICEMETHOD, ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -215,14 +215,15 @@ _sym_db.RegisterMessage(ClientCompatMessage) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\014clientcompat')) _COMPATSERVICE = _descriptor.ServiceDescriptor( name='CompatService', full_name='twirp.clientcompat.CompatService', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=277, serialized_end=421, methods=[ @@ -233,7 +234,7 @@ containing_service=None, input_type=_REQ, output_type=_RESP, - serialized_options=None, + options=None, ), _descriptor.MethodDescriptor( name='NoopMethod', @@ -242,7 +243,7 @@ containing_service=None, input_type=_EMPTY, output_type=_EMPTY, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_COMPATSERVICE) diff --git a/clientcompat/pycompat/clientcompat_pb2_twirp.py b/clientcompat/pycompat/clientcompat_pb2_twirp.py index 13a1ec3a..f8f090f9 100644 --- a/clientcompat/pycompat/clientcompat_pb2_twirp.py +++ b/clientcompat/pycompat/clientcompat_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: clientcompat.proto try: diff --git a/example/service.twirp.go b/example/service.twirp.go index aa1f1ce2..4342b82d 100644 --- a/example/service.twirp.go +++ b/example/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: service.proto /* Package example is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: service.proto @@ -326,7 +326,7 @@ func (s *haberdasherServer) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -456,7 +456,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/example/service_pb2.py b/example/service_pb2.py index 26b41e99..a6f0488b 100644 --- a/example/service_pb2.py +++ b/example/service_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='service.proto', package='twitch.twirp.example', syntax='proto3', - serialized_options=_b('Z\007example'), serialized_pb=_b('\n\rservice.proto\x12\x14twitch.twirp.example\"0\n\x03Hat\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\"\x16\n\x04Size\x12\x0e\n\x06inches\x18\x01 \x01(\x05\x32O\n\x0bHaberdasher\x12@\n\x07MakeHat\x12\x1a.twitch.twirp.example.Size\x1a\x19.twitch.twirp.example.HatB\tZ\x07\x65xampleb\x06proto3') ) @@ -38,28 +38,28 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='color', full_name='twitch.twirp.example.Hat.color', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='name', full_name='twitch.twirp.example.Hat.name', index=2, number=3, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -83,14 +83,14 @@ 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -119,14 +119,15 @@ _sym_db.RegisterMessage(Size) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\007example')) _HABERDASHER = _descriptor.ServiceDescriptor( name='Haberdasher', full_name='twitch.twirp.example.Haberdasher', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=113, serialized_end=192, methods=[ @@ -137,7 +138,7 @@ containing_service=None, input_type=_SIZE, output_type=_HAT, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_HABERDASHER) diff --git a/example/service_pb2_twirp.py b/example/service_pb2_twirp.py index e0e34c11..f1a10f57 100644 --- a/example/service_pb2_twirp.py +++ b/example/service_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: service.proto try: diff --git a/internal/gen/version.go b/internal/gen/version.go index 84f901c1..01d60554 100644 --- a/internal/gen/version.go +++ b/internal/gen/version.go @@ -13,4 +13,4 @@ package gen -const Version = "v5.4.1" +const Version = "v5.4.2" diff --git a/internal/twirptest/gogo_compat/service.twirp.go b/internal/twirptest/gogo_compat/service.twirp.go index f779605f..a0dd1b7c 100644 --- a/internal/twirptest/gogo_compat/service.twirp.go +++ b/internal/twirptest/gogo_compat/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: service.proto /* Package gogo_compat is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. Test to make sure that Twirp plays well with code generated with github.com/gogo/protobuf/protoc-gen-gofast. @@ -328,7 +328,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -458,7 +458,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/google_protobuf_imports/service.twirp.go b/internal/twirptest/google_protobuf_imports/service.twirp.go index 2b3f30b4..8a4a2654 100644 --- a/internal/twirptest/google_protobuf_imports/service.twirp.go +++ b/internal/twirptest/google_protobuf_imports/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: service.proto /* Package google_protobuf_imports is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: service.proto @@ -327,7 +327,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -457,7 +457,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/google_protobuf_imports/service_pb2.py b/internal/twirptest/google_protobuf_imports/service_pb2.py index 5dbcb717..00e76ffd 100644 --- a/internal/twirptest/google_protobuf_imports/service_pb2.py +++ b/internal/twirptest/google_protobuf_imports/service_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -20,7 +21,6 @@ name='service.proto', package='twirp.internal.twirptest.use_empty', syntax='proto3', - serialized_options=_b('Z\027google_protobuf_imports'), serialized_pb=_b('\n\rservice.proto\x12\"twirp.internal.twirptest.use_empty\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1egoogle/protobuf/wrappers.proto2C\n\x03Svc\x12<\n\x04Send\x12\x1c.google.protobuf.StringValue\x1a\x16.google.protobuf.EmptyB\x19Z\x17google_protobuf_importsb\x06proto3') , dependencies=[google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,]) @@ -30,14 +30,15 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\027google_protobuf_imports')) _SVC = _descriptor.ServiceDescriptor( name='Svc', full_name='twirp.internal.twirptest.use_empty.Svc', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=114, serialized_end=181, methods=[ @@ -48,7 +49,7 @@ containing_service=None, input_type=google_dot_protobuf_dot_wrappers__pb2._STRINGVALUE, output_type=google_dot_protobuf_dot_empty__pb2._EMPTY, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC) diff --git a/internal/twirptest/google_protobuf_imports/service_pb2_twirp.py b/internal/twirptest/google_protobuf_imports/service_pb2_twirp.py index 81da6056..8841b961 100644 --- a/internal/twirptest/google_protobuf_imports/service_pb2_twirp.py +++ b/internal/twirptest/google_protobuf_imports/service_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: service.proto try: diff --git a/internal/twirptest/importable/importable.twirp.go b/internal/twirptest/importable/importable.twirp.go index 79a3ff21..e24b8b49 100644 --- a/internal/twirptest/importable/importable.twirp.go +++ b/internal/twirptest/importable/importable.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: importable.proto /* Package importable is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. Test to make sure that importing other packages doesnt break @@ -327,7 +327,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -457,7 +457,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/importable/importable_pb2.py b/internal/twirptest/importable/importable_pb2.py index 80d41f30..ce688578 100644 --- a/internal/twirptest/importable/importable_pb2.py +++ b/internal/twirptest/importable/importable_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='importable.proto', package='twirp.internal.twirptest.importable', syntax='proto3', - serialized_options=_b('Z\nimportable'), serialized_pb=_b('\n\x10importable.proto\x12#twirp.internal.twirptest.importable\"\x05\n\x03Msg2a\n\x03Svc\x12Z\n\x04Send\x12(.twirp.internal.twirptest.importable.Msg\x1a(.twirp.internal.twirptest.importable.MsgB\x0cZ\nimportableb\x06proto3') ) @@ -38,7 +38,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -59,14 +59,15 @@ _sym_db.RegisterMessage(Msg) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\nimportable')) _SVC = _descriptor.ServiceDescriptor( name='Svc', full_name='twirp.internal.twirptest.importable.Svc', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=64, serialized_end=161, methods=[ @@ -77,7 +78,7 @@ containing_service=None, input_type=_MSG, output_type=_MSG, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC) diff --git a/internal/twirptest/importable/importable_pb2_twirp.py b/internal/twirptest/importable/importable_pb2_twirp.py index 8cb98f63..e2c89885 100644 --- a/internal/twirptest/importable/importable_pb2_twirp.py +++ b/internal/twirptest/importable/importable_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: importable.proto try: diff --git a/internal/twirptest/importer/importer.twirp.go b/internal/twirptest/importer/importer.twirp.go index 2fbebefc..82461c96 100644 --- a/internal/twirptest/importer/importer.twirp.go +++ b/internal/twirptest/importer/importer.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: importer.proto /* Package importer is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. Test to make sure that importing other packages doesnt break @@ -329,7 +329,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -459,7 +459,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/importer/importer_pb2.py b/internal/twirptest/importer/importer_pb2.py index e14d2d80..e55e7ced 100644 --- a/internal/twirptest/importer/importer_pb2.py +++ b/internal/twirptest/importer/importer_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,7 +20,6 @@ name='importer.proto', package='twirp.internal.twirptest.importer', syntax='proto3', - serialized_options=_b('Z\010importer'), serialized_pb=_b('\n\x0eimporter.proto\x12!twirp.internal.twirptest.importer\x1aHgithub.com/twitchtv/twirp/internal/twirptest/importable/importable.proto2b\n\x04Svc2\x12Z\n\x04Send\x12(.twirp.internal.twirptest.importable.Msg\x1a(.twirp.internal.twirptest.importable.MsgB\nZ\x08importerb\x06proto3') , dependencies=[github_dot_com_dot_twitchtv_dot_twirp_dot_internal_dot_twirptest_dot_importable_dot_importable__pb2.DESCRIPTOR,]) @@ -29,14 +29,15 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\010importer')) _SVC2 = _descriptor.ServiceDescriptor( name='Svc2', full_name='twirp.internal.twirptest.importer.Svc2', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=127, serialized_end=225, methods=[ @@ -47,7 +48,7 @@ containing_service=None, input_type=github_dot_com_dot_twitchtv_dot_twirp_dot_internal_dot_twirptest_dot_importable_dot_importable__pb2._MSG, output_type=github_dot_com_dot_twitchtv_dot_twirp_dot_internal_dot_twirptest_dot_importable_dot_importable__pb2._MSG, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC2) diff --git a/internal/twirptest/importer/importer_pb2_twirp.py b/internal/twirptest/importer/importer_pb2_twirp.py index 0584c4d6..ba6dccfd 100644 --- a/internal/twirptest/importer/importer_pb2_twirp.py +++ b/internal/twirptest/importer/importer_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: importer.proto try: diff --git a/internal/twirptest/importmapping/x/x.twirp.go b/internal/twirptest/importmapping/x/x.twirp.go index d56ff179..3714e417 100644 --- a/internal/twirptest/importmapping/x/x.twirp.go +++ b/internal/twirptest/importmapping/x/x.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: x/x.proto /* Package x is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: x/x.proto @@ -326,7 +326,7 @@ func (s *svc1Server) ServiceDescriptor() ([]byte, int) { } func (s *svc1Server) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -456,7 +456,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/importmapping/x/x_pb2.py b/internal/twirptest/importmapping/x/x_pb2.py index 028a2ec8..d778caf1 100644 --- a/internal/twirptest/importmapping/x/x_pb2.py +++ b/internal/twirptest/importmapping/x/x_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,7 +20,6 @@ name='x/x.proto', package='twirp.internal.twirptest.importmapping.x', syntax='proto3', - serialized_options=_b('Z\001x'), serialized_pb=_b('\n\tx/x.proto\x12(twirp.internal.twirptest.importmapping.x\x1a\ty/y.proto2n\n\x04Svc1\x12\x66\n\x04Send\x12..twirp.internal.twirptest.importmapping.y.MsgY\x1a..twirp.internal.twirptest.importmapping.y.MsgYB\x03Z\x01xb\x06proto3') , dependencies=[y_dot_y__pb2.DESCRIPTOR,]) @@ -29,14 +29,15 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\001x')) _SVC1 = _descriptor.ServiceDescriptor( name='Svc1', full_name='twirp.internal.twirptest.importmapping.x.Svc1', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=66, serialized_end=176, methods=[ @@ -47,7 +48,7 @@ containing_service=None, input_type=y_dot_y__pb2._MSGY, output_type=y_dot_y__pb2._MSGY, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC1) diff --git a/internal/twirptest/importmapping/x/x_pb2_twirp.py b/internal/twirptest/importmapping/x/x_pb2_twirp.py index 170fe7e1..ee5eaa17 100644 --- a/internal/twirptest/importmapping/x/x_pb2_twirp.py +++ b/internal/twirptest/importmapping/x/x_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: x/x.proto try: diff --git a/internal/twirptest/importmapping/y/y_pb2.py b/internal/twirptest/importmapping/y/y_pb2.py index 250da072..40a1aa77 100644 --- a/internal/twirptest/importmapping/y/y_pb2.py +++ b/internal/twirptest/importmapping/y/y_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='y/y.proto', package='twirp.internal.twirptest.importmapping.y', syntax='proto3', - serialized_options=None, serialized_pb=_b('\n\ty/y.proto\x12(twirp.internal.twirptest.importmapping.y\"\x06\n\x04MsgYb\x06proto3') ) @@ -38,7 +38,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], diff --git a/internal/twirptest/importmapping/y/y_pb2_twirp.py b/internal/twirptest/importmapping/y/y_pb2_twirp.py index 19684055..e00c498b 100644 --- a/internal/twirptest/importmapping/y/y_pb2_twirp.py +++ b/internal/twirptest/importmapping/y/y_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: y/y.proto try: diff --git a/internal/twirptest/multiple/multiple1.twirp.go b/internal/twirptest/multiple/multiple1.twirp.go index fbf8242e..33c2fd96 100644 --- a/internal/twirptest/multiple/multiple1.twirp.go +++ b/internal/twirptest/multiple/multiple1.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: multiple1.proto /* Package multiple is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. test to make sure that multiple proto files in one package works @@ -328,7 +328,7 @@ func (s *svc1Server) ServiceDescriptor() ([]byte, int) { } func (s *svc1Server) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -458,7 +458,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/multiple/multiple1_pb2.py b/internal/twirptest/multiple/multiple1_pb2.py index abb9d39a..3a08f754 100644 --- a/internal/twirptest/multiple/multiple1_pb2.py +++ b/internal/twirptest/multiple/multiple1_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='multiple1.proto', package='twirp.internal.twirptest.multiple', syntax='proto3', - serialized_options=_b('Z\010multiple'), serialized_pb=_b('\n\x0fmultiple1.proto\x12!twirp.internal.twirptest.multiple\"\x06\n\x04Msg12`\n\x04Svc1\x12X\n\x04Send\x12\'.twirp.internal.twirptest.multiple.Msg1\x1a\'.twirp.internal.twirptest.multiple.Msg1B\nZ\x08multipleb\x06proto3') ) @@ -38,7 +38,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -59,14 +59,15 @@ _sym_db.RegisterMessage(Msg1) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\010multiple')) _SVC1 = _descriptor.ServiceDescriptor( name='Svc1', full_name='twirp.internal.twirptest.multiple.Svc1', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=62, serialized_end=158, methods=[ @@ -77,7 +78,7 @@ containing_service=None, input_type=_MSG1, output_type=_MSG1, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC1) diff --git a/internal/twirptest/multiple/multiple1_pb2_twirp.py b/internal/twirptest/multiple/multiple1_pb2_twirp.py index c8dccb70..2637da87 100644 --- a/internal/twirptest/multiple/multiple1_pb2_twirp.py +++ b/internal/twirptest/multiple/multiple1_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: multiple1.proto try: diff --git a/internal/twirptest/multiple/multiple2.twirp.go b/internal/twirptest/multiple/multiple2.twirp.go index e735a643..d6f9a11c 100644 --- a/internal/twirptest/multiple/multiple2.twirp.go +++ b/internal/twirptest/multiple/multiple2.twirp.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: multiple2.proto package multiple @@ -486,7 +486,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } var twirpFileDescriptor1 = []byte{ diff --git a/internal/twirptest/multiple/multiple2_pb2.py b/internal/twirptest/multiple/multiple2_pb2.py index 15ad5037..50ec1205 100644 --- a/internal/twirptest/multiple/multiple2_pb2.py +++ b/internal/twirptest/multiple/multiple2_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,7 +20,6 @@ name='multiple2.proto', package='twirp.internal.twirptest.multiple', syntax='proto3', - serialized_options=_b('Z\010multiple'), serialized_pb=_b('\n\x0fmultiple2.proto\x12!twirp.internal.twirptest.multiple\x1a\x0fmultiple1.proto\"\x06\n\x04Msg22\xcc\x01\n\x04Svc2\x12X\n\x04Send\x12\'.twirp.internal.twirptest.multiple.Msg2\x1a\'.twirp.internal.twirptest.multiple.Msg2\x12j\n\x16SamePackageProtoImport\x12\'.twirp.internal.twirptest.multiple.Msg1\x1a\'.twirp.internal.twirptest.multiple.Msg1B\nZ\x08multipleb\x06proto3') , dependencies=[multiple1__pb2.DESCRIPTOR,]) @@ -40,7 +40,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -61,14 +61,15 @@ _sym_db.RegisterMessage(Msg2) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\010multiple')) _SVC2 = _descriptor.ServiceDescriptor( name='Svc2', full_name='twirp.internal.twirptest.multiple.Svc2', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=80, serialized_end=284, methods=[ @@ -79,7 +80,7 @@ containing_service=None, input_type=_MSG2, output_type=_MSG2, - serialized_options=None, + options=None, ), _descriptor.MethodDescriptor( name='SamePackageProtoImport', @@ -88,7 +89,7 @@ containing_service=None, input_type=multiple1__pb2._MSG1, output_type=multiple1__pb2._MSG1, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC2) diff --git a/internal/twirptest/multiple/multiple2_pb2_twirp.py b/internal/twirptest/multiple/multiple2_pb2_twirp.py index 082362d2..6cbc48bd 100644 --- a/internal/twirptest/multiple/multiple2_pb2_twirp.py +++ b/internal/twirptest/multiple/multiple2_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: multiple2.proto try: diff --git a/internal/twirptest/no_package_name/no_package_name.twirp.go b/internal/twirptest/no_package_name/no_package_name.twirp.go index 28b84bc2..8ec3b3e1 100644 --- a/internal/twirptest/no_package_name/no_package_name.twirp.go +++ b/internal/twirptest/no_package_name/no_package_name.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: no_package_name.proto /* Package no_package_name is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: no_package_name.proto @@ -324,7 +324,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -454,7 +454,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/no_package_name/no_package_name_pb2.py b/internal/twirptest/no_package_name/no_package_name_pb2.py index c9f01118..0033f6f7 100644 --- a/internal/twirptest/no_package_name/no_package_name_pb2.py +++ b/internal/twirptest/no_package_name/no_package_name_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='no_package_name.proto', package='', syntax='proto3', - serialized_options=_b('Z\017no_package_name'), serialized_pb=_b('\n\x15no_package_name.proto\"\x05\n\x03Msg2\x19\n\x03Svc\x12\x12\n\x04Send\x12\x04.Msg\x1a\x04.MsgB\x11Z\x0fno_package_nameb\x06proto3') ) @@ -38,7 +38,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -59,14 +59,15 @@ _sym_db.RegisterMessage(Msg) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\017no_package_name')) _SVC = _descriptor.ServiceDescriptor( name='Svc', full_name='Svc', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=32, serialized_end=57, methods=[ @@ -77,7 +78,7 @@ containing_service=None, input_type=_MSG, output_type=_MSG, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC) diff --git a/internal/twirptest/no_package_name/no_package_name_pb2_twirp.py b/internal/twirptest/no_package_name/no_package_name_pb2_twirp.py index 737d5ff2..c1558a9b 100644 --- a/internal/twirptest/no_package_name/no_package_name_pb2_twirp.py +++ b/internal/twirptest/no_package_name/no_package_name_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: no_package_name.proto try: diff --git a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go index b7ee9eba..eec1061a 100644 --- a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go +++ b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: no_package_name_importer.proto /* Package no_package_name_importer is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: no_package_name_importer.proto @@ -326,7 +326,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -456,7 +456,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2.py b/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2.py index 202a0b3f..386b26dc 100644 --- a/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2.py +++ b/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,7 +20,6 @@ name='no_package_name_importer.proto', package='', syntax='proto3', - serialized_options=_b('Z\030no_package_name_importer'), serialized_pb=_b('\n\x1eno_package_name_importer.proto\x1aRgithub.com/twitchtv/twirp/internal/twirptest/no_package_name/no_package_name.proto2\x1c\n\x04Svc2\x12\x14\n\x06Method\x12\x04.Msg\x1a\x04.MsgB\x1aZ\x18no_package_name_importerb\x06proto3') , dependencies=[github_dot_com_dot_twitchtv_dot_twirp_dot_internal_dot_twirptest_dot_no__package__name_dot_no__package__name__pb2.DESCRIPTOR,]) @@ -29,14 +29,15 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\030no_package_name_importer')) _SVC2 = _descriptor.ServiceDescriptor( name='Svc2', full_name='Svc2', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=118, serialized_end=146, methods=[ @@ -47,7 +48,7 @@ containing_service=None, input_type=github_dot_com_dot_twitchtv_dot_twirp_dot_internal_dot_twirptest_dot_no__package__name_dot_no__package__name__pb2._MSG, output_type=github_dot_com_dot_twitchtv_dot_twirp_dot_internal_dot_twirptest_dot_no__package__name_dot_no__package__name__pb2._MSG, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC2) diff --git a/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2_twirp.py b/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2_twirp.py index a477434b..09b9bbc1 100644 --- a/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2_twirp.py +++ b/internal/twirptest/no_package_name_importer/no_package_name_importer_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: no_package_name_importer.proto try: diff --git a/internal/twirptest/proto/proto.twirp.go b/internal/twirptest/proto/proto.twirp.go index 66812e2e..55df9c4b 100644 --- a/internal/twirptest/proto/proto.twirp.go +++ b/internal/twirptest/proto/proto.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: proto.proto /* Package proto is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. Test to make sure that a package named proto doesn't break @@ -327,7 +327,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -457,7 +457,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/proto/proto_pb2.py b/internal/twirptest/proto/proto_pb2.py index 6716649c..964f7251 100644 --- a/internal/twirptest/proto/proto_pb2.py +++ b/internal/twirptest/proto/proto_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='proto.proto', package='twirp.internal.twirptest.proto', syntax='proto3', - serialized_options=_b('Z\005proto'), serialized_pb=_b('\n\x0bproto.proto\x12\x1etwirp.internal.twirptest.proto\"\x05\n\x03Msg2W\n\x03Svc\x12P\n\x04Send\x12#.twirp.internal.twirptest.proto.Msg\x1a#.twirp.internal.twirptest.proto.MsgB\x07Z\x05protob\x06proto3') ) @@ -38,7 +38,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -59,14 +59,15 @@ _sym_db.RegisterMessage(Msg) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\005proto')) _SVC = _descriptor.ServiceDescriptor( name='Svc', full_name='twirp.internal.twirptest.proto.Svc', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=54, serialized_end=141, methods=[ @@ -77,7 +78,7 @@ containing_service=None, input_type=_MSG, output_type=_MSG, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_SVC) diff --git a/internal/twirptest/proto/proto_pb2_twirp.py b/internal/twirptest/proto/proto_pb2_twirp.py index 1a9a3acd..b67327ee 100644 --- a/internal/twirptest/proto/proto_pb2_twirp.py +++ b/internal/twirptest/proto/proto_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: proto.proto try: diff --git a/internal/twirptest/service.twirp.go b/internal/twirptest/service.twirp.go index 5fd56fcf..795c798b 100644 --- a/internal/twirptest/service.twirp.go +++ b/internal/twirptest/service.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: service.proto /* Package twirptest is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: service.proto @@ -326,7 +326,7 @@ func (s *haberdasherServer) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -456,7 +456,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go index c632914c..5059998d 100644 --- a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go +++ b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go @@ -1,9 +1,9 @@ -// Code generated by protoc-gen-twirp v5.4.1, DO NOT EDIT. +// Code generated by protoc-gen-twirp v5.4.2, DO NOT EDIT. // source: service_method_same_name.proto /* Package service_method_same_name is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.1. +This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.4.2. It is generated from these files: service_method_same_name.proto @@ -324,7 +324,7 @@ func (s *echoServer) ServiceDescriptor() ([]byte, int) { } func (s *echoServer) ProtocGenTwirpVersion() string { - return "v5.4.1" + return "v5.4.2" } // ===== @@ -454,7 +454,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v5.4.1") + req.Header.Set("Twirp-Version", "v5.4.2") return req, nil } diff --git a/internal/twirptest/service_method_same_name/service_method_same_name_pb2.py b/internal/twirptest/service_method_same_name/service_method_same_name_pb2.py index 790466d3..e835452a 100644 --- a/internal/twirptest/service_method_same_name/service_method_same_name_pb2.py +++ b/internal/twirptest/service_method_same_name/service_method_same_name_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='service_method_same_name.proto', package='', syntax='proto3', - serialized_options=_b('Z\030service_method_same_name'), serialized_pb=_b('\n\x1eservice_method_same_name.proto\"\x05\n\x03Msg2\x1c\n\x04\x45\x63ho\x12\x14\n\x04\x45\x63ho\x12\x04.Msg\x1a\x04.Msg\"\x00\x42\x1aZ\x18service_method_same_nameb\x06proto3') ) @@ -38,7 +38,7 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -59,14 +59,15 @@ _sym_db.RegisterMessage(Msg) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\030service_method_same_name')) _ECHO = _descriptor.ServiceDescriptor( name='Echo', full_name='Echo', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=41, serialized_end=69, methods=[ @@ -77,7 +78,7 @@ containing_service=None, input_type=_MSG, output_type=_MSG, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_ECHO) diff --git a/internal/twirptest/service_method_same_name/service_method_same_name_pb2_twirp.py b/internal/twirptest/service_method_same_name/service_method_same_name_pb2_twirp.py index 0a413777..ff9be3c7 100644 --- a/internal/twirptest/service_method_same_name/service_method_same_name_pb2_twirp.py +++ b/internal/twirptest/service_method_same_name/service_method_same_name_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: service_method_same_name.proto try: diff --git a/internal/twirptest/service_pb2.py b/internal/twirptest/service_pb2.py index 54dc8a84..c8c3272b 100644 --- a/internal/twirptest/service_pb2.py +++ b/internal/twirptest/service_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -18,7 +19,6 @@ name='service.proto', package='twirp.internal.twirptest', syntax='proto3', - serialized_options=_b('Z\ttwirptest'), serialized_pb=_b('\n\rservice.proto\x12\x18twirp.internal.twirptest\"0\n\x03Hat\x12\x0c\n\x04size\x18\x01 \x01(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\"\x16\n\x04Size\x12\x0e\n\x06inches\x18\x01 \x01(\x05\x32W\n\x0bHaberdasher\x12H\n\x07MakeHat\x12\x1e.twirp.internal.twirptest.Size\x1a\x1d.twirp.internal.twirptest.HatB\x0bZ\ttwirptestb\x06proto3') ) @@ -38,28 +38,28 @@ 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='color', full_name='twirp.internal.twirptest.Hat.color', 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), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='name', full_name='twirp.internal.twirptest.Hat.name', index=2, number=3, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -83,14 +83,14 @@ 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), + options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -119,14 +119,15 @@ _sym_db.RegisterMessage(Size) -DESCRIPTOR._options = None +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\ttwirptest')) _HABERDASHER = _descriptor.ServiceDescriptor( name='Haberdasher', full_name='twirp.internal.twirptest.Haberdasher', file=DESCRIPTOR, index=0, - serialized_options=None, + options=None, serialized_start=117, serialized_end=204, methods=[ @@ -137,7 +138,7 @@ containing_service=None, input_type=_SIZE, output_type=_HAT, - serialized_options=None, + options=None, ), ]) _sym_db.RegisterServiceDescriptor(_HABERDASHER) diff --git a/internal/twirptest/service_pb2_twirp.py b/internal/twirptest/service_pb2_twirp.py index 8fbf8de1..0a5a0493 100644 --- a/internal/twirptest/service_pb2_twirp.py +++ b/internal/twirptest/service_pb2_twirp.py @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_python v5.4.1, DO NOT EDIT. +# Code generated by protoc-gen-twirp_python v5.4.2, DO NOT EDIT. # source: service.proto try: