diff options
Diffstat (limited to 'python/google/protobuf/internal/message_test.py')
| -rwxr-xr-x | python/google/protobuf/internal/message_test.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/google/protobuf/internal/message_test.py b/python/google/protobuf/internal/message_test.py index 7ab814cf..4d4de510 100755 --- a/python/google/protobuf/internal/message_test.py +++ b/python/google/protobuf/internal/message_test.py @@ -51,10 +51,10 @@ import sys import unittest from google.apputils import basetest -from google.apputils.pybase import parameterized from google.protobuf import unittest_pb2 from google.protobuf import unittest_proto3_arena_pb2 from google.protobuf.internal import api_implementation +from google.protobuf.internal import _parameterized from google.protobuf.internal import test_util from google.protobuf import message @@ -72,7 +72,7 @@ def IsNegInf(val): return isinf(val) and (val < 0) -@parameterized.Parameters( +@_parameterized.Parameters( (unittest_pb2), (unittest_proto3_arena_pb2)) class MessageTest(basetest.TestCase): @@ -982,7 +982,6 @@ class Proto2Test(basetest.TestCase): # This is still an incomplete proto - so serializing should fail self.assertRaises(message.EncodeError, unpickled_message.SerializeToString) - # TODO(haberman): this isn't really a proto2-specific test except that this # message has a required field in it. Should probably be factored out so # that we can test the other parts with proto3. |