From 1fd96c43a01ec913a89de31c58c0bc9f1e5bf542 Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Tue, 7 Dec 2010 06:23:55 +0000 Subject: Add new files for vcprojs, fix issues: 165, 211, 228, 240 --- python/google/protobuf/text_format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/google') 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(): -- cgit v1.2.3