Commitca260de

committed

Fix ISSUE-140, make sure bs gets the right DOCTYPE format

1 parentbb0e7b4 commitca260deCopy full SHA for ca260de

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,12 +151,12 @@ def insertDoctype(self, token):`
`151`	`151`	`systemId=token["systemId"]`
`152`	`152`
`153`	`153`	`ifpublicId:`
`154`		`-self.soup.insert(0,Declaration("%s PUBLIC\"%s\"\"%s\""%(name,publicId,systemIdor"")))`
	`154`	`+self.soup.insert(0,Declaration("DOCTYPE%s PUBLIC\"%s\"\"%s\""%(name,publicId,systemIdor"")))`
`155`	`155`	`elifsystemId:`
`156`		`-self.soup.insert(0,Declaration("%s SYSTEM\"%s\""%`
	`156`	`+self.soup.insert(0,Declaration("DOCTYPE%s SYSTEM\"%s\""%`
`157`	`157`	`(name,systemId)))`
`158`	`158`	`else:`
`159`		`-self.soup.insert(0,Declaration(name))`
	`159`	`+self.soup.insert(0,Declaration("DOCTYPE %s"%name))`
`160`	`160`
`161`	`161`	`defelementClass(self,name,namespace):`
`162`	`162`	`ifnamespaceisnotNone:`
`@@ -188,7 +188,7 @@ def testSerializer(element):`
`188`	`188`	`rv= []`
`189`	`189`	`defserializeElement(element,indent=0):`
`190`	`190`	`ifisinstance(element,Declaration):`
`191`		`-doctype_regexp=r'(?P<name>[^\s])( PUBLIC "(?P<publicId>.)" "(?P<systemId1>.)"\| SYSTEM "(?P<systemId2>.)")?'`
	`191`	`+doctype_regexp=r'DOCTYPE\s+(?P<name>[^\s])( PUBLIC "(?P<publicId>.)" "(?P<systemId1>.)"\| SYSTEM "(?P<systemId2>.)")?'`
`192`	`192`	`m=re.compile(doctype_regexp).match(element.string)`
`193`	`193`	`assertmisnotNone,"DOCTYPE did not match expected format"`
`194`	`194`	`name=m.group('name')`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`classTreeWalker(_base.NonRecursiveTreeWalker):`
`10`	`10`	`doctype_regexp=re.compile(`
`11`		`-r'(?P<name>[^\s])(\sPUBLIC\s"(?P<publicId>.)"\s"(?P<systemId1>.)"\|\sSYSTEM\s"(?P<systemId2>.*)")?')`
	`11`	`+r'DOCTYPE\s+(?P<name>[^\s])(\sPUBLIC\s"(?P<publicId>.)"\s"(?P<systemId1>.)"\|\sSYSTEM\s"(?P<systemId2>.*)")?')`
`12`	`12`	`defgetNodeDetails(self,node):`
`13`	`13`	`ifisinstance(node,BeautifulSoup):# Document or DocumentFragment`
`14`	`14`	`return (_base.DOCUMENT,)`
`@@ -26,6 +26,7 @@ def getNodeDetails(self, node):`
`26`	`26`	`#been modified at all`
`27`	`27`	`#We could just feed to it a html5lib tokenizer, I guess...`
`28`	`28`	`assertmisnotNone,"DOCTYPE did not match expected format"`
	`29`	`+`
`29`	`30`	`name=m.group('name')`
`30`	`31`	`publicId=m.group('publicId')`
`31`	`32`	`ifpublicIdisnotNone:`

Comments

(0)