Commit9041a5d

committed

Allow DOCTYPEs to round-trip, keeping public/system identifiers.

1 parent4751ac4 commit9041a5dCopy full SHA for 9041a5d

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,23 @@ def serialize(self, treewalker, encoding=None):`
`103`	`103`	`fortokenintreewalker:`
`104`	`104`	`type=token["type"]`
`105`	`105`	`iftype=="Doctype":`
`106`		`-doctype=u"<!DOCTYPE %s>"%token["name"]`
	`106`	`+doctype=u"<!DOCTYPE %s"%token["name"]`
	`107`	`+`
	`108`	`+iftoken["publicId"]:`
	`109`	`+doctype+=u' PUBLIC "%s"'%token["publicId"]`
	`110`	`+eliftoken["systemId"]:`
	`111`	`+doctype+=u" SYSTEM"`
	`112`	`+iftoken["systemId"]:`
	`113`	`+iftoken["systemId"].find(u'"')>=0:`
	`114`	`+iftoken["systemId"].find(u"'")>=0:`
	`115`	`+self.serializeError(_("System identifer contains both single and double quote characters"))`
	`116`	`+quote_char=u"'"`
	`117`	`+else:`
	`118`	`+quote_char=u'"'`
	`119`	`+doctype+=u" %s%s%s"% (quote_char,token["systemId"],quote_char)`
	`120`	`+`
	`121`	`+doctype+=u">"`
	`122`	`+`
`107`	`123`	`ifencoding:`
`108`	`124`	`yielddoctype.encode(encoding)`
`109`	`125`	`else:`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,12 @@ def __iter__(self):`
`39`	`39`	`fortokeninself.text(token[1]):`
`40`	`40`	`yieldtoken`
`41`	`41`	`eliftype=="Doctype":`
`42`		`-yieldself.doctype(token[1])`
	`42`	`+iflen(token)==4:`
	`43`	`+yieldself.doctype(token[1],token[2],token[3])`
	`44`	`+eliflen(token)==3:`
	`45`	`+yieldself.doctype(token[1],token[2])`
	`46`	`+else:`
	`47`	`+yieldself.doctype(token[1])`
`43`	`48`	`else:`
`44`	`49`	`raiseValueError("Unknown token type: "+type)`
`45`	`50`

Comments

(0)