diff options
Diffstat (limited to 'python')
| -rwxr-xr-x | python/google/protobuf/internal/reflection_test.py | 2 | ||||
| -rw-r--r-- | python/google/protobuf/json_format.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py index 20e5d245..6f3b818a 100755 --- a/python/google/protobuf/internal/reflection_test.py +++ b/python/google/protobuf/internal/reflection_test.py @@ -636,7 +636,7 @@ class ReflectionTest(unittest.TestCase): if struct.calcsize('L') == 4: # Python only has signed ints, so 32-bit python can't fit an uint32 # in an int. - TestGetAndDeserialize('optional_uint32', 1 << 31, long) + TestGetAndDeserialize('optional_uint32', 1 << 31, integer_64) else: # 64-bit python can fit uint32 inside an int TestGetAndDeserialize('optional_uint32', 1 << 31, int) diff --git a/python/google/protobuf/json_format.py b/python/google/protobuf/json_format.py index bb6a1998..edc0cb50 100644 --- a/python/google/protobuf/json_format.py +++ b/python/google/protobuf/json_format.py @@ -310,7 +310,7 @@ def Parse(text, message, ignore_unknown_fields=False): Args: text: Message JSON representation. - message: A protocol beffer message to merge into. + message: A protocol buffer message to merge into. ignore_unknown_fields: If True, do not raise errors for unknown fields. Returns: |