From b9f46b822ec0d29bf22f80abde5c1e0036ec59fc Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Tue, 13 Aug 2024 17:02:40 -0700 Subject: [PATCH] Remove deprecated reflection.py usages from test PiperOrigin-RevId: 662703556 --- .../protobuf/internal/reflection_test.py | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py index 171b9cda81..4072644034 100755 --- a/python/google/protobuf/internal/reflection_test.py +++ b/python/google/protobuf/internal/reflection_test.py @@ -15,22 +15,23 @@ import gc import operator import struct import sys -import warnings import unittest +import warnings -from google.protobuf import descriptor_pb2 from google.protobuf import descriptor +from google.protobuf import descriptor_pb2 from google.protobuf import message +from google.protobuf import message_factory from google.protobuf import reflection from google.protobuf import text_format from google.protobuf.internal import api_implementation +from google.protobuf.internal import decoder +from google.protobuf.internal import message_set_extensions_pb2 from google.protobuf.internal import more_extensions_pb2 from google.protobuf.internal import more_messages_pb2 -from google.protobuf.internal import message_set_extensions_pb2 -from google.protobuf.internal import wire_format from google.protobuf.internal import test_util from google.protobuf.internal import testing_refleaks -from google.protobuf.internal import decoder +from google.protobuf.internal import wire_format from google.protobuf.internal import _parameterized from google.protobuf import unittest_import_pb2 from google.protobuf import unittest_mset_pb2 @@ -1567,7 +1568,8 @@ class Proto2ReflectionTest(unittest.TestCase): prius.owners.extend(['bob', 'susan']) serialized_prius = prius.SerializeToString() - new_prius = reflection.ParseMessage(desc, serialized_prius) + new_prius = message_factory.GetMessageClass(desc)() + new_prius.ParseFromString(serialized_prius) self.assertIsNot(new_prius, prius) self.assertEqual(prius, new_prius) @@ -3306,7 +3308,7 @@ class ClassAPITest(unittest.TestCase): enum_types=[], extensions=[], # pylint: disable=protected-access create_key=descriptor._internal_create_key) - reflection.MakeClass(parent_desc) + message_factory.GetMessageClass(parent_desc) def _GetSerializedFileDescriptor(self, name): """Get a serialized representation of a test FileDescriptorProto. @@ -3399,7 +3401,7 @@ class ClassAPITest(unittest.TestCase): file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('B')) msg_descriptor = descriptor.MakeDescriptor( file_descriptor.message_type[0]) - msg_class = reflection.MakeClass(msg_descriptor) + msg_class = message_factory.GetMessageClass(msg_descriptor) msg = msg_class() msg_str = ( 'flat: 0 ' @@ -3415,7 +3417,7 @@ class ClassAPITest(unittest.TestCase): file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('C')) msg_descriptor = descriptor.MakeDescriptor( file_descriptor.message_type[0]) - msg_class = reflection.MakeClass(msg_descriptor) + msg_class = message_factory.GetMessageClass(msg_descriptor) msg = msg_class() msg_str = ( 'bar {'