#9424: Replace deprecated assert* methods in the Python test suite.
diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
index ffd59c3..905dd4c 100644
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -29,7 +29,7 @@
def check(self, result, expect):
- self.assertEquals(result, expect,
+ self.assertEqual(result, expect,
'expected:\n%s\nbut got:\n%s' % (
self.show(expect), self.show(result)))
@@ -39,9 +39,9 @@
def check_split(self, text, expect):
result = self.wrapper._split(text)
- self.assertEquals(result, expect,
- "\nexpected %r\n"
- "but got %r" % (expect, result))
+ self.assertEqual(result, expect,
+ "\nexpected %r\n"
+ "but got %r" % (expect, result))
class WrapTestCase(BaseTestCase):
@@ -490,7 +490,7 @@
def assertUnchanged(self, text):
"""assert that dedent() has no effect on 'text'"""
- self.assertEquals(text, dedent(text))
+ self.assertEqual(text, dedent(text))
def test_dedent_nomargin(self):
# No lines indented.
@@ -513,17 +513,17 @@
# All lines indented by two spaces.
text = " Hello there.\n How are ya?\n Oh good."
expect = "Hello there.\nHow are ya?\nOh good."
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
# Same, with blank lines.
text = " Hello there.\n\n How are ya?\n Oh good.\n"
expect = "Hello there.\n\nHow are ya?\nOh good.\n"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
# Now indent one of the blank lines.
text = " Hello there.\n \n How are ya?\n Oh good.\n"
expect = "Hello there.\n\nHow are ya?\nOh good.\n"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
def test_dedent_uneven(self):
# Lines indented unevenly.
@@ -537,27 +537,27 @@
while 1:
return foo
'''
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
# Uneven indentation with a blank line.
text = " Foo\n Bar\n\n Baz\n"
expect = "Foo\n Bar\n\n Baz\n"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
# Uneven indentation with a whitespace-only line.
text = " Foo\n Bar\n \n Baz\n"
expect = "Foo\n Bar\n\n Baz\n"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
# dedent() should not mangle internal tabs
def test_dedent_preserve_internal_tabs(self):
text = " hello\tthere\n how are\tyou?"
expect = "hello\tthere\nhow are\tyou?"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
# make sure that it preserves tabs when it's not making any
# changes at all
- self.assertEquals(expect, dedent(expect))
+ self.assertEqual(expect, dedent(expect))
# dedent() should not mangle tabs in the margin (i.e.
# tabs and spaces both count as margin, but are *not*
@@ -573,17 +573,17 @@
# dedent() only removes whitespace that can be uniformly removed!
text = "\thello there\n\thow are you?"
expect = "hello there\nhow are you?"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
text = " \thello there\n \thow are you?"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
text = " \t hello there\n \t how are you?"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
text = " \thello there\n \t how are you?"
expect = "hello there\n how are you?"
- self.assertEquals(expect, dedent(text))
+ self.assertEqual(expect, dedent(text))
def test_main():