diff options
Diffstat (limited to 'python/google/protobuf/internal/python_message.py')
| -rwxr-xr-x | python/google/protobuf/internal/python_message.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/google/protobuf/internal/python_message.py b/python/google/protobuf/internal/python_message.py index ab5d160f..4e0f545c 100755 --- a/python/google/protobuf/internal/python_message.py +++ b/python/google/protobuf/internal/python_message.py @@ -1003,8 +1003,13 @@ def _AddEqualsMethod(message_descriptor, cls): if not self.ListFields() == other.ListFields(): return False - # pylint: disable=protected-access - return self._unknown_field_set == other._unknown_field_set + # 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__ |