From 9d68e443978afda17f59f0ff9e73af2b9b0921c2 Mon Sep 17 00:00:00 2001 From: Leonard Richardson Date: Tue, 7 Sep 2021 20:09:32 -0400 Subject: Goodbye, Python 2. [bug=1942919] --- bs4/tests/test_html5lib.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'bs4/tests/test_html5lib.py') diff --git a/bs4/tests/test_html5lib.py b/bs4/tests/test_html5lib.py index 2adebc8..f8902ad 100644 --- a/bs4/tests/test_html5lib.py +++ b/bs4/tests/test_html5lib.py @@ -5,7 +5,7 @@ import warnings try: from bs4.builder import HTML5TreeBuilder HTML5LIB_PRESENT = True -except ImportError, e: +except ImportError as e: HTML5LIB_PRESENT = False from bs4.element import SoupStrainer from bs4.testing import ( @@ -74,14 +74,14 @@ class HTML5LibBuilderSmokeTest(SoupTest, HTML5TreeBuilderSmokeTest): def test_reparented_markup(self): markup = '

foo

\n

bar

' soup = self.soup(markup) - self.assertEqual(u"

foo

\n

bar

", soup.body.decode()) + self.assertEqual("

foo

\n

bar

", soup.body.decode()) self.assertEqual(2, len(soup.find_all('p'))) def test_reparented_markup_ends_with_whitespace(self): markup = '

foo

\n

bar

\n' soup = self.soup(markup) - self.assertEqual(u"

foo

\n

bar

\n", soup.body.decode()) + self.assertEqual("

foo

\n

bar

\n", soup.body.decode()) self.assertEqual(2, len(soup.find_all('p'))) def test_reparented_markup_containing_identical_whitespace_nodes(self): @@ -127,7 +127,7 @@ class HTML5LibBuilderSmokeTest(SoupTest, HTML5TreeBuilderSmokeTest): def test_foster_parenting(self): markup = b"""A""" soup = self.soup(markup) - self.assertEqual(u"A
", soup.body.decode()) + self.assertEqual("A
", soup.body.decode()) def test_extraction(self): """ @@ -199,28 +199,28 @@ class HTML5LibBuilderSmokeTest(SoupTest, HTML5TreeBuilderSmokeTest): # HTMLParserTreeBuilderSmokeTest. It's not in the superclass # because the lxml HTML TreeBuilder _doesn't_ work this way. for input_element, output_unicode, output_element in ( - ("⇄", u'\u21c4', b'⇄'), - ('⊧', u'\u22a7', b'⊧'), - ('𝔑', u'\U0001d511', b'𝔑'), - ('≧̸', u'\u2267\u0338', b'≧̸'), - ('¬', u'\xac', b'¬'), - ('⫬', u'\u2aec', b'⫬'), - ('"', u'"', b'"'), - ('∴', u'\u2234', b'∴'), - ('∴', u'\u2234', b'∴'), - ('∴', u'\u2234', b'∴'), - ("fj", u'fj', b'fj'), - ("⊔", u'\u2294', b'⊔'), - ("⊔︀", u'\u2294\ufe00', b'⊔︀'), - ("'", u"'", b"'"), - ("|", u"|", b"|"), + ("⇄", '\u21c4', b'⇄'), + ('⊧', '\u22a7', b'⊧'), + ('𝔑', '\U0001d511', b'𝔑'), + ('≧̸', '\u2267\u0338', b'≧̸'), + ('¬', '\xac', b'¬'), + ('⫬', '\u2aec', b'⫬'), + ('"', '"', b'"'), + ('∴', '\u2234', b'∴'), + ('∴', '\u2234', b'∴'), + ('∴', '\u2234', b'∴'), + ("fj", 'fj', b'fj'), + ("⊔", '\u2294', b'⊔'), + ("⊔︀", '\u2294\ufe00', b'⊔︀'), + ("'", "'", b"'"), + ("|", "|", b"|"), ): - markup = u'
%s
' % input_element + markup = '
%s
' % input_element div = self.soup(markup).div without_element = div.encode() expect = b"
%s
" % output_unicode.encode("utf8") - self.assertEquals(without_element, expect) + self.assertEqual(without_element, expect) with_element = div.encode(formatter="html") expect = b"
%s
" % output_element - self.assertEquals(with_element, expect) + self.assertEqual(with_element, expect) -- cgit v1.2.3