Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc8140dd

Browse files
committed
Add support for comments as siblings of the root node to lxml
--HG--extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401116
1 parent11ec09e commitc8140dd

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

‎src/html5lib/treebuilders/etree_lxml.py‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self):
3636
self._childNodes= []
3737

3838
defappendChild(self,element):
39-
warnings.warn("lxml does not support comments as siblings of the root node",DataLossWarning)
39+
self._elementTree.getroot().addnext(element._element)
4040

4141
def_getChildNodes(self):
4242
returnself._childNodes
@@ -50,11 +50,19 @@ def serializeElement(element, indent=0):
5050
ifnothasattr(element,"tag"):
5151
rv.append("#document")
5252
ifelement.docinfo.internalDTD:
53-
dtd_str=element.docinfo.doctype
54-
ifnotdtd_str:
53+
ifnot (element.docinfo.public_idorelement.docinfo.system_url):
5554
dtd_str="<!DOCTYPE %s>"%element.docinfo.root_name
55+
else:
56+
dtd_str="""<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
57+
element.docinfo.root_name,element.docinfo.public_id,
58+
element.docinfo.system_url)
5659
rv.append("|%s%s"%(' '*(indent+2),dtd_str))
57-
serializeElement(element.getroot(),indent+2)
60+
next_element=element.getroot()
61+
whilenext_element.getprevious()isnotNone:
62+
next_element=next_element.getprevious()
63+
whilenext_elementisnotNone:
64+
serializeElement(next_element,indent+2)
65+
next_element=next_element.getnext()
5866
eliftype(element.tag)==type(etree.Comment):
5967
rv.append("|%s<!-- %s -->"%(' '*indent,element.text))
6068
else:
@@ -136,6 +144,7 @@ def __init__(self, fullTree = False):
136144
defreset(self):
137145
_base.TreeBuilder.reset(self)
138146
self.insertComment=self.insertCommentInitial
147+
self.initial_comments= []
139148
self.doctype=None
140149

141150
deftestSerializer(self,element):
@@ -159,7 +168,7 @@ def insertDoctype(self, name, publicId, systemId):
159168
self.doctype=doctype
160169

161170
definsertCommentInitial(self,data,parent=None):
162-
warnings.warn("lxml does not support comments as siblings of the root node",DataLossWarning)
171+
self.initial_comments.append(data)
163172

164173
definsertRoot(self,name):
165174
"""Create the document root"""
@@ -181,6 +190,10 @@ def insertRoot(self, name):
181190
printdocStr
182191
raise
183192

193+
#Append the initial comments:
194+
forcomment_datainself.initial_comments:
195+
root.addprevious(etree.Comment(comment_data))
196+
184197
#Create the root document and add the ElementTree to it
185198
self.document=self.documentClass()
186199
self.document._elementTree=root.getroottree()

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp