From a2abc947c0d509354e61e321215989829a68794e Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 13 Jan 2015 15:47:55 -0500 Subject: Straddle Python 2.6, 2.7, 3.3, 3.4. --- python/google/protobuf/internal/text_format_test.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'python/google/protobuf/internal/text_format_test.py') diff --git a/python/google/protobuf/internal/text_format_test.py b/python/google/protobuf/internal/text_format_test.py index e8b365ff..eda38ae9 100755 --- a/python/google/protobuf/internal/text_format_test.py +++ b/python/google/protobuf/internal/text_format_test.py @@ -233,7 +233,7 @@ class TextFormatTest(unittest.TestCase): parsed_message = unittest_pb2.TestAllTypes() r = text_format.Parse(wire_text, parsed_message) self.assertIs(r, parsed_message) - self.assertEquals(message, parsed_message) + self.assertEqual(message, parsed_message) # Test as_utf8 = True. wire_text = text_format.MessageToString( @@ -241,7 +241,7 @@ class TextFormatTest(unittest.TestCase): parsed_message = unittest_pb2.TestAllTypes() r = text_format.Parse(wire_text, parsed_message) self.assertIs(r, parsed_message) - self.assertEquals(message, parsed_message, + self.assertEqual(message, parsed_message, '\n%s != %s' % (message, parsed_message)) def testPrintRawUtf8String(self): @@ -251,7 +251,7 @@ class TextFormatTest(unittest.TestCase): self.CompareToGoldenText(text, 'repeated_string: "\303\274\352\234\237"\n') parsed_message = unittest_pb2.TestAllTypes() text_format.Parse(text, parsed_message) - self.assertEquals(message, parsed_message, + self.assertEqual(message, parsed_message, '\n%s != %s' % (message, parsed_message)) def testPrintFloatFormat(self): @@ -309,7 +309,7 @@ class TextFormatTest(unittest.TestCase): message = unittest_pb2.TestAllTypes() test_util.SetAllFields(message) - self.assertEquals(message, parsed_message) + self.assertEqual(message, parsed_message) def testParseGoldenExtensions(self): golden_text = '\n'.join(self.ReadGolden( @@ -319,7 +319,7 @@ class TextFormatTest(unittest.TestCase): message = unittest_pb2.TestAllExtensions() test_util.SetAllExtensions(message) - self.assertEquals(message, parsed_message) + self.assertEqual(message, parsed_message) def testParseAllFields(self): message = unittest_pb2.TestAllTypes() @@ -360,8 +360,8 @@ class TextFormatTest(unittest.TestCase): text_format.Parse(text, message) ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension - self.assertEquals(23, message.message_set.Extensions[ext1].i) - self.assertEquals('foo', message.message_set.Extensions[ext2].str) + self.assertEqual(23, message.message_set.Extensions[ext1].i) + self.assertEqual('foo', message.message_set.Extensions[ext2].str) def testParseExotic(self): message = unittest_pb2.TestAllTypes() @@ -408,7 +408,7 @@ class TextFormatTest(unittest.TestCase): message = unittest_pb2.TestAllTypes() text = '' text_format.Parse(text, message) - self.assertEquals(unittest_pb2.TestAllTypes(), message) + self.assertEqual(unittest_pb2.TestAllTypes(), message) def testParseInvalidUtf8(self): message = unittest_pb2.TestAllTypes() @@ -581,7 +581,7 @@ class TextFormatTest(unittest.TestCase): message = unittest_pb2.TestAllTypes() test_util.SetAllFields(message) - self.assertEquals(message, parsed_message) + self.assertEqual(message, parsed_message) def testMergeLinesGolden(self): opened = self.ReadGolden('text_format_unittest_data.txt') -- cgit v1.2.3