From df26dc64d868875d7cd8ca550f1a174d68dd7c67 Mon Sep 17 00:00:00 2001 From: Leonard Richardson Date: Fri, 20 Jan 2012 14:22:42 -0500 Subject: Replaced assertEquals with assertEqual to get rid of deprecation notice. --- bs4/tests/test_html5lib.py | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'bs4/tests/test_html5lib.py') diff --git a/bs4/tests/test_html5lib.py b/bs4/tests/test_html5lib.py index 85cedbf..b136ba0 100644 --- a/bs4/tests/test_html5lib.py +++ b/bs4/tests/test_html5lib.py @@ -27,7 +27,7 @@ class TestHTML5Builder(TestLXMLBuilder): markup = "

A bold statement.

" soup = self.soup(markup, parse_only=strainer) - self.assertEquals( + self.assertEqual( soup.decode(), self.document_for(markup)) def test_bare_string(self): @@ -60,7 +60,7 @@ class TestHTML5Builder(TestLXMLBuilder): def test_literal_in_textarea(self): markup = '' soup = self.soup(markup) - self.assertEquals( + self.assertEqual( soup.textarea.contents, ["Junk like tags and <&<&"]) def test_collapsed_whitespace(self): @@ -122,17 +122,17 @@ class TestHTML5BuilderInvalidMarkup(TestLXMLBuilderInvalidMarkup): markup = "
" soup = self.soup(markup) data = soup.find(text="[CDATA[foo]]") - self.assertEquals(data.__class__, Comment) + self.assertEqual(data.__class__, Comment) def test_nonsensical_declaration(self): # Declarations that don't make any sense are turned into comments. soup = self.soup('

a

') - self.assertEquals(str(soup), + self.assertEqual(str(soup), ("" "

a

")) soup = self.soup('

a

') - self.assertEquals(str(soup), + self.assertEqual(str(soup), ("

a

" "")) @@ -141,7 +141,7 @@ class TestHTML5BuilderInvalidMarkup(TestLXMLBuilderInvalidMarkup): soup = self.soup(( '' '

foo

')) - self.assertEquals( + self.assertEqual( str(soup), ('' '

foo

')) @@ -154,70 +154,70 @@ class TestHTML5BuilderInvalidMarkup(TestLXMLBuilderInvalidMarkup): # Let's spell that out a little more explicitly. soup = self.soup(markup) str1, comment, str2 = soup.body.contents - self.assertEquals(str1, 'a') - self.assertEquals(comment.__class__, Comment) - self.assertEquals(comment, 'b a') # 'Foo' becomes a comment that appears before the HTML. comment = soup.contents[0] self.assertTrue(isinstance(comment, Comment)) - self.assertEquals(comment, 'Foo') + self.assertEqual(comment, 'Foo') - self.assertEquals(self.find(text="a") == "a") + self.assertEqual(self.find(text="a") == "a") def test_attribute_value_was_closed_by_subsequent_tag(self): markup = """baz""" soup = self.soup(markup) # The string between the first and second quotes was interpreted # as the value of the 'href' attribute. - self.assertEquals(soup.a['href'], 'foo, ,

a

') # The declaration becomes a comment. comment = soup.contents[0] self.assertTrue(isinstance(comment, Comment)) - self.assertEquals(comment, ' Foo ') - self.assertEquals(soup.p.string, 'a') + self.assertEqual(comment, ' Foo ') + self.assertEqual(soup.p.string, 'a') def test_document_ends_with_incomplete_declaration(self): soup = self.soup('

a<Hello>") # Compare html5lib, which completes the entity. - self.assertEquals(soup.p.string, "") + self.assertEqual(soup.p.string, "") def test_nonexistent_entity(self): soup = self.soup("

foo&#bar;baz

") - self.assertEquals(soup.p.string, "foo&#bar;baz") + self.assertEqual(soup.p.string, "foo&#bar;baz") # Compare a real entity. soup = self.soup("

foodbaz

") - self.assertEquals(soup.p.string, "foodbaz") + self.assertEqual(soup.p.string, "foodbaz") def test_entity_out_of_range(self): # An entity that's out of range will be converted to # REPLACEMENT CHARACTER. soup = self.soup("

�

") - self.assertEquals(soup.p.string, u"\N{REPLACEMENT CHARACTER}") + self.assertEqual(soup.p.string, u"\N{REPLACEMENT CHARACTER}") soup = self.soup("

�

") - self.assertEquals(soup.p.string, u"\N{REPLACEMENT CHARACTER}") + self.assertEqual(soup.p.string, u"\N{REPLACEMENT CHARACTER}") @unittest.skipIf( @@ -233,7 +233,7 @@ class TestHTML5LibEncodingConversion(TestLXMLBuilderEncodingConversion): # Hebrew encoding) to UTF-8. soup = self.soup(self.HEBREW_DOCUMENT, from_encoding="iso-8859-8") - self.assertEquals(soup.original_encoding, 'iso8859-8') - self.assertEquals( + self.assertEqual(soup.original_encoding, 'iso8859-8') + self.assertEqual( soup.encode('utf-8'), self.HEBREW_DOCUMENT.decode("iso-8859-8").encode("utf-8")) -- cgit v1.2.3