Commitd0d5186

committed

Serialize system/public id in tests

--HG--extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401130

1 parentc86e113 commitd0d5186Copy full SHA for d0d5186

File tree

+37

-5

lines changed

+37

-5

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,13 @@ def testSerializer(element):`
`138`	`138`	`defserializeElement(element,indent=0):`
`139`	`139`	`ifelement.nodeType==Node.DOCUMENT_TYPE_NODE:`
`140`	`140`	`ifelement.name:`
`141`		`-rv.append("\|%s<!DOCTYPE %s>"%(' '*indent,element.name))`
	`141`	`+ifelement.publicIdorelement.systemId:`
	`142`	`+publicId=element.publicIdor""`
	`143`	`+systemId=element.systemIdor""`
	`144`	`+rv.append("""\|%s<!DOCTYPE %s PUBLIC "%s" "%s">"""%(`
	`145`	`+' '*indent,element.name,publicId,systemId))`
	`146`	`+else:`
	`147`	`+rv.append("\|%s<!DOCTYPE %s>"%(' '*indent,element.name))`
`142`	`148`	`else:`
`143`	`149`	`rv.append("\|%s<!DOCTYPE >"%(' '*indent,))`
`144`	`150`	`elifelement.nodeType==Node.DOCUMENT_NODE:`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,13 @@ def serializeElement(element, indent=0):`
`169`	`169`	`ifnot(hasattr(element,"tag")):`
`170`	`170`	`element=element.getroot()`
`171`	`171`	`ifelement.tag=="<!DOCTYPE>":`
`172`		`-rv.append("\|%s<!DOCTYPE %s>"%(' '*indent,element.text))`
	`172`	`+ifelement.get("publicId")orelement.get("systemId"):`
	`173`	`+publicId=element.get("publicId")or""`
	`174`	`+systemId=element.get("systemId")or""`
	`175`	`+rv.append("""<!DOCTYPE %s PUBLIC "%s" "%s">"""%(`
	`176`	`+element.text,publicId,systemId))`
	`177`	`+else:`
	`178`	`+rv.append("<!DOCTYPE %s>"%(element.text,))`
`173`	`179`	`elifelement.tag=="<DOCUMENT_ROOT>":`
`174`	`180`	`rv.append("#document")`
`175`	`181`	`ifelement.text:`
`@@ -206,7 +212,13 @@ def serializeElement(element):`
`206`	`212`	`element=element.getroot()`
`207`	`213`
`208`	`214`	`ifelement.tag=="<!DOCTYPE>":`
`209`		`-rv.append("<!DOCTYPE %s>"%(element.text,))`
	`215`	`+ifelement.get("publicId")orelement.get("systemId"):`
	`216`	`+publicId=element.get("publicId")or""`
	`217`	`+systemId=element.get("systemId")or""`
	`218`	`+rv.append("""<!DOCTYPE %s PUBLIC "%s" "%s">"""%(`
	`219`	`+element.text,publicId,systemId))`
	`220`	`+else:`
	`221`	`+rv.append("<!DOCTYPE %s>"%(element.text,))`
`210`	`222`	`elifelement.tag=="<DOCUMENT_ROOT>":`
`211`	`223`	`ifelement.text:`
`212`	`224`	`rv.append(element.text)`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,15 @@ def __init__(self, name):`
`112`	`112`	`self.systemId=u""`
`113`	`113`
`114`	`114`	`def__unicode__(self):`
`115`		`-returnu"<!DOCTYPE %s>"%self.name`
	`115`	`+ifself.publicIdorself.systemId:`
	`116`	`+publicId=self.publicIdor""`
	`117`	`+systemId=self.systemIdor""`
	`118`	`+return"""<!DOCTYPE %s PUBLIC "%s" "%s">"""%(`
	`119`	`+self.name,publicId,systemId)`
	`120`	`+`
	`121`	`+else:`
	`122`	`+returnu"<!DOCTYPE %s>"%self.name`
	`123`	`+`
`116`	`124`
`117`	`125`	`toxml=__unicode__`
`118`	`126`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,12 @@ def documentClass(self):`
`104`	`104`	`returnElement(self.soup,self.soup)`
`105`	`105`
`106`	`106`	`definsertDoctype(self,name,publicId,systemId):`
`107`		`-self.soup.insert(0,Declaration(name))`
	`107`	`+ifpublicIdorsystemId:`
	`108`	`+publicId=publicIdor""`
	`109`	`+systemId=systemIdor""`
	`110`	`+self.soup.insert(0,Declaration("%s PUBLIC\"%s\"\"%s\""%(name,publicId,systemId)))`
	`111`	`+else:`
	`112`	`+self.soup.insert(0,Declaration(name))`
`108`	`113`
`109`	`114`	`defelementClass(self,name):`
`110`	`115`	`returnElement(Tag(self.soup,name),self.soup)`
`@@ -134,6 +139,7 @@ def testSerializer(element):`
`134`	`139`	`defserializeElement(element,indent=0):`
`135`	`140`	`ifisinstance(element,Declaration):`
`136`	`141`	`rv.append("\|%s<!DOCTYPE %s>"%(' '*indent,element.string))`
	`142`	`+`
`137`	`143`	`elifisinstance(element,BeautifulSoup):`
`138`	`144`	`ifelement.name=="[document_fragment]":`
`139`	`145`	`rv.append("#document-fragment")`

Comments

(0)