Goodbye, Python 2. [bug=1942919]

1 files changed, 24 insertions, 24 deletions

diff --git a/bs4/tests/test_htmlparser.py b/bs4/tests/test_htmlparser.py
index e84eced..0d8161e 100644
--- a/bs4/tests/test_htmlparser.py
+++ b/bs4/tests/test_htmlparser.py
@@ -61,20 +61,20 @@ class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest):
         # If you don't provide any particular value for
         # on_duplicate_attribute, later values replace earlier values.
         soup = self.soup(markup)
-        self.assertEquals("url3", soup.a['href'])
-        self.assertEquals(["cls"], soup.a['class'])
-        self.assertEquals("id", soup.a['id'])
+        self.assertEqual("url3", soup.a['href'])
+        self.assertEqual(["cls"], soup.a['class'])
+        self.assertEqual("id", soup.a['id'])
         
         # You can also get this behavior explicitly.
         def assert_attribute(on_duplicate_attribute, expected):
             soup = self.soup(
                 markup, on_duplicate_attribute=on_duplicate_attribute
             )
-            self.assertEquals(expected, soup.a['href'])
+            self.assertEqual(expected, soup.a['href'])
 
             # Verify that non-duplicate attributes are treated normally.
-            self.assertEquals(["cls"], soup.a['class'])
-            self.assertEquals("id", soup.a['id'])
+            self.assertEqual(["cls"], soup.a['class'])
+            self.assertEqual("id", soup.a['id'])
         assert_attribute(None, "url3")
         assert_attribute(BeautifulSoupHTMLParser.REPLACE, "url3")
 
@@ -94,31 +94,31 @@ class HTMLParserTreeBuilderSmokeTest(SoupTest, HTMLTreeBuilderSmokeTest):
         # convert those Unicode characters to a (potentially
         # different) named entity on the way out.
         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'<div>%s</div>' % input_element
+            markup = '<div>%s</div>' % input_element
             div = self.soup(markup).div
             without_element = div.encode()
             expect = b"<div>%s</div>" % output_unicode.encode("utf8")
-            self.assertEquals(without_element, expect)
+            self.assertEqual(without_element, expect)
 
             with_element = div.encode(formatter="html")
             expect = b"<div>%s</div>" % output_element
-            self.assertEquals(with_element, expect)
+            self.assertEqual(with_element, expect)
 
 
 class TestHTMLParserSubclass(SoupTest):