Hebrew (ISO 8859-8) in Visual Directionality

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_lxml.py | 106 ++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'bs4/tests/test_lxml.py') diff --git a/bs4/tests/test_lxml.py b/bs4/tests/test_lxml.py index 0eafab0..d1f4276 100644 --- a/bs4/tests/test_lxml.py +++ b/bs4/tests/test_lxml.py @@ -55,7 +55,7 @@ class TestLXMLBuilder(SoupTest): soup = self.soup(markup) comment = soup.find(text="foobar") - self.assertEquals(comment.__class__, Comment) + self.assertEqual(comment.__class__, Comment) def test_nested_inline_elements(self): # Inline tags can be nested indefinitely. @@ -138,28 +138,28 @@ class TestLXMLBuilder(SoupTest): # best to parse the contents of a ' soup = self.soup(text) - self.assertEquals(len(soup.textarea.contents), 2) - self.assertEquals(soup.textarea.contents[0], u"Junk like ") - self.assertEquals(soup.textarea.contents[1].name, 'b') - self.assertEquals(soup.textarea.b.string, u" tags and ") + self.assertEqual(len(soup.textarea.contents), 2) + self.assertEqual(soup.textarea.contents[0], u"Junk like ") + self.assertEqual(soup.textarea.contents[1].name, 'b') + self.assertEqual(soup.textarea.b.string, u" tags and ") def test_literal_in_script(self): # The contents of a ' % javascript) - self.assertEquals(soup.script.string, javascript) + self.assertEqual(soup.script.string, javascript) def test_naked_ampersands(self): # Ampersands are left alone. text = "

AT&T

" soup = self.soup(text) - self.assertEquals(soup.p.string, "AT&T") + self.assertEqual(soup.p.string, "AT&T") # Even if they're in attribute values. invalid_url = 'foo' soup = self.soup(invalid_url) - self.assertEquals(soup.a['href'], "http://example.org?a=1&b=2;3") + self.assertEqual(soup.a['href'], "http://example.org?a=1&b=2;3") def test_entities_in_strings_converted_during_parsing(self): # Both XML and HTML entities are converted to Unicode characters @@ -173,13 +173,13 @@ class TestLXMLBuilder(SoupTest): # parsing. quote = b"

\x91Foo\x92

" soup = self.soup(quote) - self.assertEquals( + self.assertEqual( soup.p.string, u"\N{LEFT SINGLE QUOTATION MARK}Foo\N{RIGHT SINGLE QUOTATION MARK}") def test_non_breaking_spaces_converted_on_the_way_in(self): soup = self.soup(" ") - self.assertEquals(soup.a.string, u"\N{NO-BREAK SPACE}" * 2) + self.assertEqual(soup.a.string, u"\N{NO-BREAK SPACE}" * 2) def test_cdata_where_its_ok(self): # lxml strips CDATA sections, no matter where they occur. @@ -192,13 +192,13 @@ class TestLXMLBuilder(SoupTest): markup = doctype_str + '

foo

' soup = self.soup(markup) doctype = soup.contents[0] - self.assertEquals(doctype.__class__, Doctype) - self.assertEquals(doctype, doctype_fragment) - self.assertEquals(str(soup)[:len(doctype_str)], doctype_str) + self.assertEqual(doctype.__class__, Doctype) + self.assertEqual(doctype, doctype_fragment) + self.assertEqual(str(soup)[:len(doctype_str)], doctype_str) # Make sure that the doctype was correctly associated with the # parse tree and that the rest of the document parsed. - self.assertEquals(soup.p.contents[0], 'foo') + self.assertEqual(soup.p.contents[0], 'foo') def test_doctype(self): # Test a normal HTML doctype you'll commonly see in a real document. @@ -238,7 +238,7 @@ class TestLXMLBuilder(SoupTest): expected = expected.encode("utf-8") # Ta-da! - self.assertEquals(result, expected) + self.assertEqual(result, expected) def test_real_shift_jis_document(self): # Smoke test to make sure the parser can handle a document in @@ -254,8 +254,8 @@ class TestLXMLBuilder(SoupTest): # Make sure the parse tree is correctly encoded to various # encodings. - self.assertEquals(soup.encode("utf-8"), unicode_html.encode("utf-8")) - self.assertEquals(soup.encode("euc_jp"), unicode_html.encode("euc_jp")) + self.assertEqual(soup.encode("utf-8"), unicode_html.encode("utf-8")) + self.assertEqual(soup.encode("euc_jp"), unicode_html.encode("euc_jp")) # Tests below this line need work. @@ -275,9 +275,9 @@ class TestLXMLBuilder(SoupTest): # Parse the document, and the charset is replaced with a # generic value. parsed_meta = soup.find('meta', {'http-equiv': 'Content-type'}) - self.assertEquals(parsed_meta['content'], + self.assertEqual(parsed_meta['content'], 'text/html; charset=%SOUP-ENCODING%') - self.assertEquals(parsed_meta.contains_substitutions, True) + self.assertEqual(parsed_meta.contains_substitutions, True) # For the rest of the story, see TestSubstitutions in # test_tree.py. @@ -287,25 +287,25 @@ class TestLXMLBuilder(SoupTest): expected = u"<<sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!>>".encode("utf-8") soup = self.soup(text) str = soup.p.string - #self.assertEquals(str.encode("utf-8"), expected) + #self.assertEqual(str.encode("utf-8"), expected) def test_br_tag_is_empty_element(self): """A
tag is designated as an empty-element tag.""" soup = self.soup("

") self.assertTrue(soup.br.is_empty_element) - self.assertEquals(str(soup.br), "
") + self.assertEqual(str(soup.br), "
") def test_p_tag_is_not_empty_element(self): """A

tag is not designated as an empty-element tag.""" soup = self.soup("

") self.assertFalse(soup.p.is_empty_element) - self.assertEquals(str(soup.p), "

") + self.assertEqual(str(soup.p), "

") def test_soupstrainer(self): strainer = SoupStrainer("b") soup = self.soup("A bold statement", parse_only=strainer) - self.assertEquals(soup.decode(), "bold") + self.assertEqual(soup.decode(), "bold") class TestLXMLBuilderInvalidMarkup(SoupTest): @@ -348,7 +348,7 @@ class TestLXMLBuilderInvalidMarkup(SoupTest): def test_boolean_attribute_with_no_value_gets_empty_value(self): soup = self.soup("

foo

") - self.assertEquals(soup.table.td['nowrap'], '') + self.assertEqual(soup.table.td['nowrap'], '') def test_incorrectly_nested_tables(self): self.assertSoupEquals( @@ -359,7 +359,7 @@ class TestLXMLBuilderInvalidMarkup(SoupTest): markup = self.soup("

this is the definition:" "

first case