Fix riak_pb to pass bytes to _ParseOptions#527
Open
zmedico wants to merge 1 commit intobasho:masterfrom
Open
Conversation
This fixes errors like the following observed with protobuf-3.3.0:
Traceback (most recent call last):
File "/usr/lib64/python3.4/site-packages/google/protobuf/internal/python_message.py", line 1063, in MergeFromString
if self._InternalParse(serialized, 0, length) != length:
File "/usr/lib64/python3.4/site-packages/google/protobuf/internal/python_message.py", line 1085, in InternalParse
(tag_bytes, new_pos) = local_ReadTag(buffer, pos)
File "/usr/lib64/python3.4/site-packages/google/protobuf/internal/decoder.py", line 181, in ReadTag
while six.indexbytes(buffer, pos) & 0x80:
TypeError: unsupported operand type(s) for &: 'str' and 'int'
During handling of the above exception, another exception occurred:
File "riak-2.7.0/riak/pb/riak_dt_pb2.py", line 984, in <module>
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), '\n\027com.basho.riak.protobufB\010RiakDtPB')
File "/usr/lib64/python3.4/site-packages/google/protobuf/descriptor.py", line 869, in _ParseOptions
message.ParseFromString(string)
File "/usr/lib64/python3.4/site-packages/google/protobuf/message.py", line 185, in ParseFromString
self.MergeFromString(serialized)
File "/usr/lib64/python3.4/site-packages/google/protobuf/internal/python_message.py", line 1069, in MergeFromString
raise message_mod.DecodeError('Truncated message.')
google.protobuf.message.DecodeError: Truncated message.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes errors like the following observed with protobuf-3.3.0: