diff options
author | Jisi Liu <liujisi@google.com> | 2017-07-24 20:37:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-24 20:37:35 -0700 |
commit | eb6b3320a52cfe5cd88437e3346cb83a1f1f928f (patch) | |
tree | 2466239a247d79ff159d7f786535cc9c31d4023a | |
parent | 72cc5a6eb3975bbe3bc8454f053835d9e46dbcb5 (diff) | |
parent | 9c012ed07d9bea4ac7012a9e697488ccde00c398 (diff) | |
download | protobuf-eb6b3320a52cfe5cd88437e3346cb83a1f1f928f.tar.gz protobuf-eb6b3320a52cfe5cd88437e3346cb83a1f1f928f.tar.bz2 protobuf-eb6b3320a52cfe5cd88437e3346cb83a1f1f928f.zip |
Merge pull request #3412 from anandolee/3.4.x
Use keys() instead of iterkeys() to be python3 compatbile.
-rwxr-xr-x | python/google/protobuf/internal/encoder.py | 2 | ||||
-rwxr-xr-x | python/google/protobuf/internal/message_test.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/encoder.py b/python/google/protobuf/internal/encoder.py index f8c36390..ebec42e5 100755 --- a/python/google/protobuf/internal/encoder.py +++ b/python/google/protobuf/internal/encoder.py @@ -819,7 +819,7 @@ def MapEncoder(field_descriptor): encode_message = MessageEncoder(field_descriptor.number, False, False) def EncodeField(write, value, deterministic): - value_keys = sorted(value.iterkeys()) if deterministic else value.iterkeys() + value_keys = sorted(value.keys()) if deterministic else value.keys() for key in value_keys: entry_msg = message_type._concrete_class(key=key, value=value[key]) encode_message(write, entry_msg, deterministic) diff --git a/python/google/protobuf/internal/message_test.py b/python/google/protobuf/internal/message_test.py index 6f60586a..29a515b2 100755 --- a/python/google/protobuf/internal/message_test.py +++ b/python/google/protobuf/internal/message_test.py @@ -166,6 +166,9 @@ class MessageTest(BaseTestCase): def __nonzero__(self): raise BadArgError() + def __bool__(self): + raise BadArgError() + with self.assertRaises(BadArgError): golden_message.SerializeToString(deterministic=BadArg()) |