diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-07-20 13:01:04 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-20 13:01:04 -0700 |
| commit | 062df3d0724d9ae5e3c65d481dc1d3aca811152e (patch) | |
| tree | 8b4944b714296d2c9010148812222359cb556d2f /python | |
| parent | 040f56e61b379e92dfdf107b12244a7580f60823 (diff) | |
| parent | 5555d3b0785d7a73299fa95203073c4bab2af97a (diff) | |
Merge pull request #3179 from bjwatson/fix-duration-typo
Fix typos in comment
Diffstat (limited to 'python')
| -rw-r--r-- | python/google/protobuf/json_format.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/google/protobuf/json_format.py b/python/google/protobuf/json_format.py index d02cb091..937285b0 100644 --- a/python/google/protobuf/json_format.py +++ b/python/google/protobuf/json_format.py @@ -532,8 +532,8 @@ class _Parser(object): def _ConvertGenericMessage(self, value, message): """Convert a JSON representation into message with FromJsonString.""" - # Durantion, Timestamp, FieldMask have FromJsonString method to do the - # convert. Users can also call the method directly. + # Duration, Timestamp, FieldMask have a FromJsonString method to do the + # conversion. Users can also call the method directly. message.FromJsonString(value) def _ConvertValueMessage(self, value, message): |