diff options
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-12 21:10:30 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-12 21:10:30 +0000 |
| commit | bde4a3254a7de58911941b0fbf38e9dd992de973 (patch) | |
| tree | 02b151c2ec6e9be2e9d5ea0efc406aabe6958ae7 /python/google/protobuf/message.py | |
| parent | d7339318a33c5f9e8b5dded4077223fbd4ebf229 (diff) | |
| download | protobuf-bde4a3254a7de58911941b0fbf38e9dd992de973.tar.gz protobuf-bde4a3254a7de58911941b0fbf38e9dd992de973.tar.bz2 protobuf-bde4a3254a7de58911941b0fbf38e9dd992de973.zip | |
down integrate python opensource to svn
Diffstat (limited to 'python/google/protobuf/message.py')
| -rwxr-xr-x | python/google/protobuf/message.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/python/google/protobuf/message.py b/python/google/protobuf/message.py index 6ec2f8be..37b0af14 100755 --- a/python/google/protobuf/message.py +++ b/python/google/protobuf/message.py @@ -177,7 +177,11 @@ class Message(object): raise NotImplementedError def ParseFromString(self, serialized): - """Like MergeFromString(), except we clear the object first.""" + """Parse serialized protocol buffer data into this message. + + Like MergeFromString(), except we clear the object first and + do not return the value that MergeFromString returns. + """ self.Clear() self.MergeFromString(serialized) |