Commit6d29b33

James Graham

committed

Handle utf8 better

1 parent0437f25 commit6d29b33Copy full SHA for 6d29b33

File tree

2 files changed

+13

-12

lines changed

html5lib/tests
- support.py
- test_parser.py

2 files changed

+13

-12

lines changed

`‎html5lib/tests/support.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`importos`
`2`	`2`	`importsys`
	`3`	`+importcodecs`
`3`	`4`	`importglob`
`4`	`5`
`5`	`6`	`base_path=os.path.split(__file__)[0]`
`@@ -74,7 +75,7 @@ def __getitem__(self, key):`
`74`	`75`
`75`	`76`	`classTestData(object):`
`76`	`77`	`def__init__(self,filename,newTestHeading="data"):`
`77`		`-self.f=open(filename)`
	`78`	`+self.f=codecs.open(filename,encoding="utf8")`
`78`	`79`	`self.newTestHeading=newTestHeading`
`79`	`80`
`80`	`81`	`def__iter__(self):`

`‎html5lib/tests/test_parser.py`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,22 +84,20 @@ def runParserTest(self, innerHTML, input, expected, errors, treeClass,`
`84`	`84`	`p=html5parser.HTMLParser(tree=treeClass,`
`85`	`85`	`namespaceHTMLElements=namespaceHTMLElements)`
`86`	`86`	`exceptconstants.DataLossWarning:`
`87`		`-return`
	`87`	`+return`
`88`	`88`
`89`		`-errors= [item.decode("utf-8")foriteminerrors]`
`90`		`-`
`91`	`89`	`try:`
`92`	`90`	`ifinnerHTML:`
`93`		`-document=p.parseFragment(StringIO.StringIO(input),innerHTML)`
	`91`	`+document=p.parseFragment(input,innerHTML)`
`94`	`92`	`else:`
`95`	`93`	`try:`
`96`		`-document=p.parse(StringIO.StringIO(input))`
	`94`	`+document=p.parse(input)`
`97`	`95`	`exceptconstants.DataLossWarning:`
`98`	`96`	`return`
`99`	`97`	`except:`
`100`		`-errorMsg="\n".join(["\n\nInput:",input,"\nExpected:",expected,`
`101`		`-"\nTraceback:",traceback.format_exc()])`
`102`		`-self.assertTrue(False,errorMsg)`
	`98`	`+errorMsg=u"\n".join([u"\n\nInput:",input,u"\nExpected:",expected,`
	`99`	`+u"\nTraceback:",traceback.format_exc()])`
	`100`	`+self.assertTrue(False,errorMsg.encode("utf8"))`
`103`	`101`
`104`	`102`	`output=convertTreeDump(p.tree.testSerializer(document))`
`105`	`103`	`output=attrlist.sub(sortattrs,output)`
`@@ -109,9 +107,9 @@ def runParserTest(self, innerHTML, input, expected, errors, treeClass,`
`109`	`107`	`ifnamespaceHTMLElements:`
`110`	`108`	`expected=namespaceExpected(r"\1<html \2>",expected)`
`111`	`109`
`112`		`-errorMsg="\n".join(["\n\nInput:",input,"\nExpected:",expected,`
`113`		`-"\nReceived:",output])`
`114`		`-self.assertEquals(expected,output,errorMsg.encode("utf-8"))`
	`110`	`+errorMsg=u"\n".join([u"\n\nInput:",input,u"\nExpected:",expected,`
	`111`	`+u"\nReceived:",output])`
	`112`	`+self.assertEquals(expected,output,errorMsg.encode("utf8"))`
`115`	`113`	`errStr= [u"Line: %i Col: %i %s"%(line,col,`
`116`	`114`	`constants.E[errorcode]%datavarsifisinstance(datavars,dict)else (datavars,))for`
`117`	`115`	`((line,col),errorcode,datavars)inp.errors]`
`@@ -152,6 +150,8 @@ def testFunc(self, innerHTML=innerHTML, input=input,`
`152`	`150`	`testFunc.__name__="test_%s_%d_%s_%s"% (testName,index+1,treeName,namespaceHTMLElementsand"namespaced"or"no_html_namespace")`
`153`	`151`	`setattr(TestCase,testFunc.__name__,`
`154`	`152`	`testFunc)`
	`153`	`+break`
	`154`	`+break`
`155`	`155`
`156`	`156`	`returnunittest.TestLoader().loadTestsFromTestCase(TestCase)`
`157`	`157`

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!

Commit6d29b33

File tree

2 files changed

2 files changed

`‎html5lib/tests/support.py`

`‎html5lib/tests/test_parser.py`

0 commit comments