aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-03-31 13:36:32 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-03-31 13:36:32 -0700
commitfc7eeda69c970a1f893acc17c69ed2def1611c25 (patch)
treeb1048238ec08bb6a4e0cdb1e859a852de5ebcdbb
parent94aa50ffd6e8994c1ec9c09cc596ec77692e6be7 (diff)
downloadprotobuf-fc7eeda69c970a1f893acc17c69ed2def1611c25.tar.gz
protobuf-fc7eeda69c970a1f893acc17c69ed2def1611c25.tar.bz2
protobuf-fc7eeda69c970a1f893acc17c69ed2def1611c25.zip
Fix json_format.py in py26
-rw-r--r--python/google/protobuf/json_format.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/google/protobuf/json_format.py b/python/google/protobuf/json_format.py
index 4342755a..7921556e 100644
--- a/python/google/protobuf/json_format.py
+++ b/python/google/protobuf/json_format.py
@@ -271,8 +271,10 @@ def _ListValueMessageToJsonObject(message, unused_including_default=False):
def _StructMessageToJsonObject(message, unused_including_default=False):
"""Converts Struct message according to Proto3 JSON Specification."""
fields = message.fields
- return {key: _ValueMessageToJsonObject(fields[key])
- for key in fields}
+ ret = {}
+ for key in fields:
+ ret[key] = _ValueMessageToJsonObject(fields[key])
+ return ret
def _IsWrapperMessage(message_descriptor):