diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-09-06 11:14:15 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-06 11:14:15 -0700 |
commit | 74638a253ea76baa0aed78491b92d157326295a6 (patch) | |
tree | 0c1ab9aee0b2815717067b9111b2eb4e7da2a2c0 | |
parent | 9b8da104c12a2947b6e6d7a7da30a3ae56b31675 (diff) | |
parent | 64958cdb1d68a0ddaf10bd0ebdb4c112c370c416 (diff) | |
download | protobuf-74638a253ea76baa0aed78491b92d157326295a6.tar.gz protobuf-74638a253ea76baa0aed78491b92d157326295a6.tar.bz2 protobuf-74638a253ea76baa0aed78491b92d157326295a6.zip |
Merge pull request #2047 from jonathon-love/master
Fix to typo/oversight in reflection tests
-rwxr-xr-x | python/google/protobuf/internal/reflection_test.py | 2 |
1 files changed, 1 insertions, 1 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) |