Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit172380c

Browse files
committed
Fix tests raising DeprecationWarning.
It turns out nose doesn't run test files which are executable, hencethese haven't been run in a while and starting causingDeprecationWarning; this fixes this and hence gets them passingagain.
1 parent0a729a3 commit172380c

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎html5lib/tests/test_parser2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MoreParserTests(unittest.TestCase):
1717
deftest_assertDoctypeCloneable(self):
1818
parser=html5parser.HTMLParser(tree=dom.TreeBuilder)
1919
doc=parser.parse('<!DOCTYPE HTML>')
20-
self.assert_(doc.cloneNode(True))
20+
self.assertTrue(doc.cloneNode(True))
2121

2222
deftest_line_counter(self):
2323
# http://groups.google.com/group/html5lib-discuss/browse_frm/thread/f4f00e4a2f26d5c0
@@ -27,12 +27,12 @@ def test_line_counter(self):
2727
deftest_namespace_html_elements_0(self):
2828
parser=html5parser.HTMLParser(namespaceHTMLElements=True)
2929
doc=parser.parse("<html></html>")
30-
self.assert_(doc.childNodes[0].namespace==namespaces["html"])
30+
self.assertTrue(doc.childNodes[0].namespace==namespaces["html"])
3131

3232
deftest_namespace_html_elements_1(self):
3333
parser=html5parser.HTMLParser(namespaceHTMLElements=False)
3434
doc=parser.parse("<html></html>")
35-
self.assert_(doc.childNodes[0].namespace==None)
35+
self.assertTrue(doc.childNodes[0].namespace==None)
3636

3737
deftest_unicode_file(self):
3838
parser=html5parser.HTMLParser()

‎html5lib/tests/test_stream.py

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,77 +19,77 @@ class HTMLInputStreamTest(unittest.TestCase):
1919

2020
deftest_char_ascii(self):
2121
stream=HTMLInputStream(b"'",encoding='ascii')
22-
self.assertEquals(stream.charEncoding[0],'ascii')
23-
self.assertEquals(stream.char(),"'")
22+
self.assertEqual(stream.charEncoding[0],'ascii')
23+
self.assertEqual(stream.char(),"'")
2424

2525
deftest_char_utf8(self):
2626
stream=HTMLInputStream('\u2018'.encode('utf-8'),encoding='utf-8')
27-
self.assertEquals(stream.charEncoding[0],'utf-8')
28-
self.assertEquals(stream.char(),'\u2018')
27+
self.assertEqual(stream.charEncoding[0],'utf-8')
28+
self.assertEqual(stream.char(),'\u2018')
2929

3030
deftest_char_win1252(self):
3131
stream=HTMLInputStream("\xa9\xf1\u2019".encode('windows-1252'))
32-
self.assertEquals(stream.charEncoding[0],'windows-1252')
33-
self.assertEquals(stream.char(),"\xa9")
34-
self.assertEquals(stream.char(),"\xf1")
35-
self.assertEquals(stream.char(),"\u2019")
32+
self.assertEqual(stream.charEncoding[0],'windows-1252')
33+
self.assertEqual(stream.char(),"\xa9")
34+
self.assertEqual(stream.char(),"\xf1")
35+
self.assertEqual(stream.char(),"\u2019")
3636

3737
deftest_bom(self):
3838
stream=HTMLInputStream(codecs.BOM_UTF8+b"'")
39-
self.assertEquals(stream.charEncoding[0],'utf-8')
40-
self.assertEquals(stream.char(),"'")
39+
self.assertEqual(stream.charEncoding[0],'utf-8')
40+
self.assertEqual(stream.char(),"'")
4141

4242
deftest_utf_16(self):
4343
stream=HTMLInputStream((' '*1025).encode('utf-16'))
44-
self.assert_(stream.charEncoding[0]in ['utf-16-le','utf-16-be'],stream.charEncoding)
45-
self.assertEquals(len(stream.charsUntil(' ',True)),1025)
44+
self.assertTrue(stream.charEncoding[0]in ['utf-16-le','utf-16-be'],stream.charEncoding)
45+
self.assertEqual(len(stream.charsUntil(' ',True)),1025)
4646

4747
deftest_newlines(self):
4848
stream=HTMLBinaryInputStreamShortChunk(codecs.BOM_UTF8+b"a\nbb\r\nccc\rddddxe")
49-
self.assertEquals(stream.position(), (1,0))
50-
self.assertEquals(stream.charsUntil('c'),"a\nbb\n")
51-
self.assertEquals(stream.position(), (3,0))
52-
self.assertEquals(stream.charsUntil('x'),"ccc\ndddd")
53-
self.assertEquals(stream.position(), (4,4))
54-
self.assertEquals(stream.charsUntil('e'),"x")
55-
self.assertEquals(stream.position(), (4,5))
49+
self.assertEqual(stream.position(), (1,0))
50+
self.assertEqual(stream.charsUntil('c'),"a\nbb\n")
51+
self.assertEqual(stream.position(), (3,0))
52+
self.assertEqual(stream.charsUntil('x'),"ccc\ndddd")
53+
self.assertEqual(stream.position(), (4,4))
54+
self.assertEqual(stream.charsUntil('e'),"x")
55+
self.assertEqual(stream.position(), (4,5))
5656

5757
deftest_newlines2(self):
5858
size=HTMLUnicodeInputStream._defaultChunkSize
5959
stream=HTMLInputStream("\r"*size+"\n")
60-
self.assertEquals(stream.charsUntil('x'),"\n"*size)
60+
self.assertEqual(stream.charsUntil('x'),"\n"*size)
6161

6262
deftest_position(self):
6363
stream=HTMLBinaryInputStreamShortChunk(codecs.BOM_UTF8+b"a\nbb\nccc\nddde\nf\ngh")
64-
self.assertEquals(stream.position(), (1,0))
65-
self.assertEquals(stream.charsUntil('c'),"a\nbb\n")
66-
self.assertEquals(stream.position(), (3,0))
64+
self.assertEqual(stream.position(), (1,0))
65+
self.assertEqual(stream.charsUntil('c'),"a\nbb\n")
66+
self.assertEqual(stream.position(), (3,0))
6767
stream.unget("\n")
68-
self.assertEquals(stream.position(), (2,2))
69-
self.assertEquals(stream.charsUntil('c'),"\n")
70-
self.assertEquals(stream.position(), (3,0))
68+
self.assertEqual(stream.position(), (2,2))
69+
self.assertEqual(stream.charsUntil('c'),"\n")
70+
self.assertEqual(stream.position(), (3,0))
7171
stream.unget("\n")
72-
self.assertEquals(stream.position(), (2,2))
73-
self.assertEquals(stream.char(),"\n")
74-
self.assertEquals(stream.position(), (3,0))
75-
self.assertEquals(stream.charsUntil('e'),"ccc\nddd")
76-
self.assertEquals(stream.position(), (4,3))
77-
self.assertEquals(stream.charsUntil('h'),"e\nf\ng")
78-
self.assertEquals(stream.position(), (6,1))
72+
self.assertEqual(stream.position(), (2,2))
73+
self.assertEqual(stream.char(),"\n")
74+
self.assertEqual(stream.position(), (3,0))
75+
self.assertEqual(stream.charsUntil('e'),"ccc\nddd")
76+
self.assertEqual(stream.position(), (4,3))
77+
self.assertEqual(stream.charsUntil('h'),"e\nf\ng")
78+
self.assertEqual(stream.position(), (6,1))
7979

8080
deftest_position2(self):
8181
stream=HTMLUnicodeInputStreamShortChunk("abc\nd")
82-
self.assertEquals(stream.position(), (1,0))
83-
self.assertEquals(stream.char(),"a")
84-
self.assertEquals(stream.position(), (1,1))
85-
self.assertEquals(stream.char(),"b")
86-
self.assertEquals(stream.position(), (1,2))
87-
self.assertEquals(stream.char(),"c")
88-
self.assertEquals(stream.position(), (1,3))
89-
self.assertEquals(stream.char(),"\n")
90-
self.assertEquals(stream.position(), (2,0))
91-
self.assertEquals(stream.char(),"d")
92-
self.assertEquals(stream.position(), (2,1))
82+
self.assertEqual(stream.position(), (1,0))
83+
self.assertEqual(stream.char(),"a")
84+
self.assertEqual(stream.position(), (1,1))
85+
self.assertEqual(stream.char(),"b")
86+
self.assertEqual(stream.position(), (1,2))
87+
self.assertEqual(stream.char(),"c")
88+
self.assertEqual(stream.position(), (1,3))
89+
self.assertEqual(stream.char(),"\n")
90+
self.assertEqual(stream.position(), (2,0))
91+
self.assertEqual(stream.char(),"d")
92+
self.assertEqual(stream.position(), (2,1))
9393

9494

9595
defbuildTestSuite():

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp