Fix tests raising DeprecationWarning.

gsnedders · gsnedders · commit 172380cb21e1 · 2013-04-28T14:00:09.000+01:00
It turns out nose doesn't run test files which are executable, hence
these haven't been run in a while and starting causing
DeprecationWarning; this fixes this and hence gets them passing
again.
diff --git a/html5lib/tests/test_parser2.py b/html5lib/tests/test_parser2.py
@@ -17,7 +17,7 @@ class MoreParserTests(unittest.TestCase):
     def test_assertDoctypeCloneable(self):
         parser = html5parser.HTMLParser(tree=dom.TreeBuilder)
         doc = parser.parse('<!DOCTYPE HTML>')
-        self.assert_(doc.cloneNode(True))
+        self.assertTrue(doc.cloneNode(True))
 
     def test_line_counter(self):
         # http://groups.google.com/group/html5lib-discuss/browse_frm/thread/f4f00e4a2f26d5c0
@@ -27,12 +27,12 @@ def test_line_counter(self):
     def test_namespace_html_elements_0(self):
         parser = html5parser.HTMLParser(namespaceHTMLElements=True)
         doc = parser.parse("<html></html>")
-        self.assert_(doc.childNodes[0].namespace == namespaces["html"])
+        self.assertTrue(doc.childNodes[0].namespace == namespaces["html"])
 
     def test_namespace_html_elements_1(self):
         parser = html5parser.HTMLParser(namespaceHTMLElements=False)
         doc = parser.parse("<html></html>")
-        self.assert_(doc.childNodes[0].namespace == None)
+        self.assertTrue(doc.childNodes[0].namespace == None)
 
     def test_unicode_file(self):
         parser = html5parser.HTMLParser()
diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py
@@ -19,77 +19,77 @@ class HTMLInputStreamTest(unittest.TestCase):
 
     def test_char_ascii(self):
         stream = HTMLInputStream(b"'", encoding='ascii')
-        self.assertEquals(stream.charEncoding[0], 'ascii')
-        self.assertEquals(stream.char(), "'")
+        self.assertEqual(stream.charEncoding[0], 'ascii')
+        self.assertEqual(stream.char(), "'")
 
     def test_char_utf8(self):
         stream = HTMLInputStream('\u2018'.encode('utf-8'), encoding='utf-8')
-        self.assertEquals(stream.charEncoding[0], 'utf-8')
-        self.assertEquals(stream.char(), '\u2018')
+        self.assertEqual(stream.charEncoding[0], 'utf-8')
+        self.assertEqual(stream.char(), '\u2018')
 
     def test_char_win1252(self):
         stream = HTMLInputStream("\xa9\xf1\u2019".encode('windows-1252'))
-        self.assertEquals(stream.charEncoding[0], 'windows-1252')
-        self.assertEquals(stream.char(), "\xa9")
-        self.assertEquals(stream.char(), "\xf1")
-        self.assertEquals(stream.char(), "\u2019")
+        self.assertEqual(stream.charEncoding[0], 'windows-1252')
+        self.assertEqual(stream.char(), "\xa9")
+        self.assertEqual(stream.char(), "\xf1")
+        self.assertEqual(stream.char(), "\u2019")
 
     def test_bom(self):
         stream = HTMLInputStream(codecs.BOM_UTF8 + b"'")
-        self.assertEquals(stream.charEncoding[0], 'utf-8')
-        self.assertEquals(stream.char(), "'")
+        self.assertEqual(stream.charEncoding[0], 'utf-8')
+        self.assertEqual(stream.char(), "'")
 
     def test_utf_16(self):
         stream = HTMLInputStream((' ' * 1025).encode('utf-16'))
-        self.assert_(stream.charEncoding[0] in ['utf-16-le', 'utf-16-be'], stream.charEncoding)
-        self.assertEquals(len(stream.charsUntil(' ', True)), 1025)
+        self.assertTrue(stream.charEncoding[0] in ['utf-16-le', 'utf-16-be'], stream.charEncoding)
+        self.assertEqual(len(stream.charsUntil(' ', True)), 1025)
 
     def test_newlines(self):
         stream = HTMLBinaryInputStreamShortChunk(codecs.BOM_UTF8 + b"a\nbb\r\nccc\rddddxe")
-        self.assertEquals(stream.position(), (1, 0))
-        self.assertEquals(stream.charsUntil('c'), "a\nbb\n")
-        self.assertEquals(stream.position(), (3, 0))
-        self.assertEquals(stream.charsUntil('x'), "ccc\ndddd")
-        self.assertEquals(stream.position(), (4, 4))
-        self.assertEquals(stream.charsUntil('e'), "x")
-        self.assertEquals(stream.position(), (4, 5))
+        self.assertEqual(stream.position(), (1, 0))
+        self.assertEqual(stream.charsUntil('c'), "a\nbb\n")
+        self.assertEqual(stream.position(), (3, 0))
+        self.assertEqual(stream.charsUntil('x'), "ccc\ndddd")
+        self.assertEqual(stream.position(), (4, 4))
+        self.assertEqual(stream.charsUntil('e'), "x")
+        self.assertEqual(stream.position(), (4, 5))
 
     def test_newlines2(self):
         size = HTMLUnicodeInputStream._defaultChunkSize
         stream = HTMLInputStream("\r" * size + "\n")
-        self.assertEquals(stream.charsUntil('x'), "\n" * size)
+        self.assertEqual(stream.charsUntil('x'), "\n" * size)
 
     def test_position(self):
         stream = HTMLBinaryInputStreamShortChunk(codecs.BOM_UTF8 + b"a\nbb\nccc\nddde\nf\ngh")
-        self.assertEquals(stream.position(), (1, 0))
-        self.assertEquals(stream.charsUntil('c'), "a\nbb\n")
-        self.assertEquals(stream.position(), (3, 0))
+        self.assertEqual(stream.position(), (1, 0))
+        self.assertEqual(stream.charsUntil('c'), "a\nbb\n")
+        self.assertEqual(stream.position(), (3, 0))
         stream.unget("\n")
-        self.assertEquals(stream.position(), (2, 2))
-        self.assertEquals(stream.charsUntil('c'), "\n")
-        self.assertEquals(stream.position(), (3, 0))
+        self.assertEqual(stream.position(), (2, 2))
+        self.assertEqual(stream.charsUntil('c'), "\n")
+        self.assertEqual(stream.position(), (3, 0))
         stream.unget("\n")
-        self.assertEquals(stream.position(), (2, 2))
-        self.assertEquals(stream.char(), "\n")
-        self.assertEquals(stream.position(), (3, 0))
-        self.assertEquals(stream.charsUntil('e'), "ccc\nddd")
-        self.assertEquals(stream.position(), (4, 3))
-        self.assertEquals(stream.charsUntil('h'), "e\nf\ng")
-        self.assertEquals(stream.position(), (6, 1))
+        self.assertEqual(stream.position(), (2, 2))
+        self.assertEqual(stream.char(), "\n")
+        self.assertEqual(stream.position(), (3, 0))
+        self.assertEqual(stream.charsUntil('e'), "ccc\nddd")
+        self.assertEqual(stream.position(), (4, 3))
+        self.assertEqual(stream.charsUntil('h'), "e\nf\ng")
+        self.assertEqual(stream.position(), (6, 1))
 
     def test_position2(self):
         stream = HTMLUnicodeInputStreamShortChunk("abc\nd")
-        self.assertEquals(stream.position(), (1, 0))
-        self.assertEquals(stream.char(), "a")
-        self.assertEquals(stream.position(), (1, 1))
-        self.assertEquals(stream.char(), "b")
-        self.assertEquals(stream.position(), (1, 2))
-        self.assertEquals(stream.char(), "c")
-        self.assertEquals(stream.position(), (1, 3))
-        self.assertEquals(stream.char(), "\n")
-        self.assertEquals(stream.position(), (2, 0))
-        self.assertEquals(stream.char(), "d")
-        self.assertEquals(stream.position(), (2, 1))
+        self.assertEqual(stream.position(), (1, 0))
+        self.assertEqual(stream.char(), "a")
+        self.assertEqual(stream.position(), (1, 1))
+        self.assertEqual(stream.char(), "b")
+        self.assertEqual(stream.position(), (1, 2))
+        self.assertEqual(stream.char(), "c")
+        self.assertEqual(stream.position(), (1, 3))
+        self.assertEqual(stream.char(), "\n")
+        self.assertEqual(stream.position(), (2, 0))
+        self.assertEqual(stream.char(), "d")
+        self.assertEqual(stream.position(), (2, 1))
 
 
 def buildTestSuite():
