Commit40ff8fb

committed

Fix input stream tests.

1 parent8d3bd1a commit40ff8fbCopy full SHA for 40ff8fb

File tree

2 files changed

+13

-10

lines changed

html5lib
- inputstream.py
- tests
  - test_stream.py

2 files changed

+13

-10

lines changed

`‎html5lib/inputstream.py‎`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -504,8 +504,8 @@ def detectBOM(self):`
`504`	`504`	`encoding otherwise return None"""`
`505`	`505`	`bomDict= {`
`506`	`506`	`codecs.BOM_UTF8:'utf-8',`
`507`		`-codecs.BOM_UTF16_LE:'utf-16-le',codecs.BOM_UTF16_BE:'utf-16-be',`
`508`		`-codecs.BOM_UTF32_LE:'utf-32-le',codecs.BOM_UTF32_BE:'utf-32-be'`
	`507`	`+codecs.BOM_UTF16_LE:'utf-16le',codecs.BOM_UTF16_BE:'utf-16be',`
	`508`	`+codecs.BOM_UTF32_LE:'utf-32le',codecs.BOM_UTF32_BE:'utf-32be'`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`# Go to beginning of file and read in 4 bytes`
`@@ -525,9 +525,12 @@ def detectBOM(self):`
`525`	`525`
`526`	`526`	`# Set the read position past the BOM if one was found, otherwise`
`527`	`527`	`# set it to the start of the stream`
`528`		`-self.rawStream.seek(encodingandseekor0)`
`529`		`-`
`530`		`-returnlookupEncoding(encoding)`
	`528`	`+ifencoding:`
	`529`	`+self.rawStream.seek(seek)`
	`530`	`+returnlookupEncoding(encoding)`
	`531`	`+else:`
	`532`	`+self.rawStream.seek(0)`
	`533`	`+returnNone`
`531`	`534`
`532`	`535`	`defdetectEncodingMeta(self):`
`533`	`536`	`"""Report the encoding declared by the meta element`

`‎html5lib/tests/test_stream.py‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,29 +84,29 @@ class HTMLInputStreamTest(unittest.TestCase):`
`84`	`84`
`85`	`85`	`deftest_char_ascii(self):`
`86`	`86`	`stream=HTMLInputStream(b"'",encoding='ascii')`
`87`		`-self.assertEqual(stream.charEncoding[0],'ascii')`
	`87`	`+self.assertEqual(stream.charEncoding[0].name,'windows-1252')`
`88`	`88`	`self.assertEqual(stream.char(),"'")`
`89`	`89`
`90`	`90`	`deftest_char_utf8(self):`
`91`	`91`	`stream=HTMLInputStream('\u2018'.encode('utf-8'),encoding='utf-8')`
`92`		`-self.assertEqual(stream.charEncoding[0],'utf-8')`
	`92`	`+self.assertEqual(stream.charEncoding[0].name,'utf-8')`
`93`	`93`	`self.assertEqual(stream.char(),'\u2018')`
`94`	`94`
`95`	`95`	`deftest_char_win1252(self):`
`96`	`96`	`stream=HTMLInputStream("\xa9\xf1\u2019".encode('windows-1252'))`
`97`		`-self.assertEqual(stream.charEncoding[0],'windows-1252')`
	`97`	`+self.assertEqual(stream.charEncoding[0].name,'windows-1252')`
`98`	`98`	`self.assertEqual(stream.char(),"\xa9")`
`99`	`99`	`self.assertEqual(stream.char(),"\xf1")`
`100`	`100`	`self.assertEqual(stream.char(),"\u2019")`
`101`	`101`
`102`	`102`	`deftest_bom(self):`
`103`	`103`	`stream=HTMLInputStream(codecs.BOM_UTF8+b"'")`
`104`		`-self.assertEqual(stream.charEncoding[0],'utf-8')`
	`104`	`+self.assertEqual(stream.charEncoding[0].name,'utf-8')`
`105`	`105`	`self.assertEqual(stream.char(),"'")`
`106`	`106`
`107`	`107`	`deftest_utf_16(self):`
`108`	`108`	`stream=HTMLInputStream((' '*1025).encode('utf-16'))`
`109`		`-self.assertTrue(stream.charEncoding[0]in ['utf-16-le','utf-16-be'],stream.charEncoding)`
	`109`	`+self.assertTrue(stream.charEncoding[0].namein ['utf-16le','utf-16be'],stream.charEncoding)`
`110`	`110`	`self.assertEqual(len(stream.charsUntil(' ',True)),1025)`
`111`	`111`
`112`	`112`	`deftest_newlines(self):`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit40ff8fb

File tree

2 files changed

2 files changed

`‎html5lib/inputstream.py‎`

`‎html5lib/tests/test_stream.py‎`

0 commit comments