diff options
| author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-07 06:23:55 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-12-07 06:23:55 +0000 |
| commit | 1fd96c43a01ec913a89de31c58c0bc9f1e5bf542 (patch) | |
| tree | fd75a0bffe10b1e57155cbf70d32d41e44302be0 /python | |
| parent | b4d64bf7f3aa65318a5262977e59f42595c4c5d0 (diff) | |
| download | protobuf-1fd96c43a01ec913a89de31c58c0bc9f1e5bf542.tar.gz protobuf-1fd96c43a01ec913a89de31c58c0bc9f1e5bf542.tar.bz2 protobuf-1fd96c43a01ec913a89de31c58c0bc9f1e5bf542.zip | |
Add new files for vcprojs, fix issues: 165, 211, 228, 240
Diffstat (limited to 'python')
| -rwxr-xr-x | python/google/protobuf/text_format.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/text_format.py b/python/google/protobuf/text_format.py index 6d77b543..c3a1cf60 100755 --- a/python/google/protobuf/text_format.py +++ b/python/google/protobuf/text_format.py @@ -222,7 +222,7 @@ def _MergeField(tokenizer, message): sub_message = message.Extensions[field] else: sub_message = getattr(message, field.name) - sub_message.SetInParent() + sub_message.SetInParent() while not tokenizer.TryConsume(end_token): if tokenizer.AtEnd(): |