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

Commitb2e4802

Browse files
committed
Speedup setting attributes on etree implementations
1 parentb075e51 commitb2e4802

File tree

2 files changed

+55
-30
lines changed

2 files changed

+55
-30
lines changed

‎html5lib/treebuilders/etree.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
importre
77

8+
fromcopyimportcopy
9+
810
from .importbase
911
from ..import_ihatexml
1012
from ..importconstants
@@ -61,16 +63,17 @@ def _getAttributes(self):
6163
returnself._element.attrib
6264

6365
def_setAttributes(self,attributes):
64-
# Delete existing attributes first
65-
# XXX - there may be a better way to do this...
66-
forkeyinlist(self._element.attrib.keys()):
67-
delself._element.attrib[key]
68-
forkey,valueinattributes.items():
69-
ifisinstance(key,tuple):
70-
name="{%s}%s"% (key[2],key[1])
71-
else:
72-
name=key
73-
self._element.set(name,value)
66+
el_attrib=self._element.attrib
67+
el_attrib.clear()
68+
ifattributes:
69+
# calling .items _always_ allocates, and the above truthy check is cheaper than the
70+
# allocation on average
71+
forkey,valueinattributes.items():
72+
ifisinstance(key,tuple):
73+
name="{%s}%s"% (key[2],key[1])
74+
else:
75+
name=key
76+
el_attrib[name]=value
7477

7578
attributes=property(_getAttributes,_setAttributes)
7679

@@ -129,8 +132,8 @@ def insertText(self, data, insertBefore=None):
129132

130133
defcloneNode(self):
131134
element=type(self)(self.name,self.namespace)
132-
forname,valueinself.attributes.items():
133-
element.attributes[name]=value
135+
ifself._element.attrib:
136+
element._element.attrib=copy(self._element.attrib)
134137
returnelement
135138

136139
defreparentChildren(self,newParent):

‎html5lib/treebuilders/etree_lxml.py‎

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@
1616
importre
1717
importsys
1818

19+
try:
20+
fromcollections.abcimportMutableMapping
21+
exceptImportError:
22+
fromcollectionsimportMutableMapping
23+
1924
from .importbase
2025
from ..constantsimportDataLossWarning
2126
from ..importconstants
2227
from .importetreeasetree_builders
2328
from ..import_ihatexml
2429

2530
importlxml.etreeasetree
31+
fromsiximportPY3,binary_type
2632

2733

2834
fullTree=True
@@ -189,26 +195,37 @@ def __init__(self, namespaceHTMLElements, fullTree=False):
189195
infosetFilter=self.infosetFilter=_ihatexml.InfosetFilter(preventDoubleDashComments=True)
190196
self.namespaceHTMLElements=namespaceHTMLElements
191197

192-
classAttributes(dict):
193-
def__init__(self,element,value=None):
194-
ifvalueisNone:
195-
value= {}
198+
classAttributes(MutableMapping):
199+
def__init__(self,element):
196200
self._element=element
197-
dict.__init__(self,value)# pylint:disable=non-parent-init-called
198-
forkey,valueinself.items():
199-
ifisinstance(key,tuple):
200-
name="{%s}%s"% (key[2],infosetFilter.coerceAttribute(key[1]))
201-
else:
202-
name=infosetFilter.coerceAttribute(key)
203-
self._element._element.attrib[name]=value
204201

205-
def__setitem__(self,key,value):
206-
dict.__setitem__(self,key,value)
202+
def_coerceKey(self,key):
207203
ifisinstance(key,tuple):
208204
name="{%s}%s"% (key[2],infosetFilter.coerceAttribute(key[1]))
209205
else:
210206
name=infosetFilter.coerceAttribute(key)
211-
self._element._element.attrib[name]=value
207+
returnname
208+
209+
def__getitem__(self,key):
210+
value=self._element._element.attrib[self._coerceKey(key)]
211+
ifnotPY3andisinstance(value,binary_type):
212+
value=value.decode("ascii")
213+
returnvalue
214+
215+
def__setitem__(self,key,value):
216+
self._element._element.attrib[self._coerceKey(key)]=value
217+
218+
def__delitem__(self,key):
219+
delself._element._element.attrib[self._coerceKey(key)]
220+
221+
def__iter__(self):
222+
returniter(self._element._element.attrib)
223+
224+
def__len__(self):
225+
returnlen(self._element._element.attrib)
226+
227+
defclear(self):
228+
returnself._element._element.attrib.clear()
212229

213230
classElement(builder.Element):
214231
def__init__(self,name,namespace):
@@ -229,17 +246,22 @@ def _getName(self):
229246
def_getAttributes(self):
230247
returnself._attributes
231248

232-
def_setAttributes(self,attributes):
233-
self._attributes=Attributes(self,attributes)
249+
def_setAttributes(self,value):
250+
attributes=self.attributes
251+
attributes.clear()
252+
attributes.update(value)
234253

235254
attributes=property(_getAttributes,_setAttributes)
236255

237256
definsertText(self,data,insertBefore=None):
238257
data=infosetFilter.coerceCharacters(data)
239258
builder.Element.insertText(self,data,insertBefore)
240259

241-
defappendChild(self,child):
242-
builder.Element.appendChild(self,child)
260+
defcloneNode(self):
261+
element=type(self)(self.name,self.namespace)
262+
ifself._element.attrib:
263+
element._element.attrib.update(self._element.attrib)
264+
returnelement
243265

244266
classComment(builder.Comment):
245267
def__init__(self,data):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp