mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added non-ns start and end element methods. 

Moved appendChild calls from DOMEventStream to PullDOM (parser indep).
Removed duplicated sibling pointer setting (duplicated in appendChild).
This commit is contained in:
Lars Gustäbel 2000-10-11 22:34:04 +00:00
parent 93615657ec
commit d178ba666b
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Lib/xml/dom/pulldom.py
View File

@ -51,10 +51,8 @@ def startElementNS(self, name, tagName , attrs):
node.setAttributeNode(attr) node.setAttributeNode(attr)
parent = self.curNode parent = self.curNode
parent.appendChild(node)
node.parentNode = parent node.parentNode = parent
if parent.childNodes:
node.previousSibling = parent.childNodes[-1]
node.previousSibling.nextSibling = node
self.curNode = node self.curNode = node
self.lastEvent[1] = [(START_ELEMENT, node), None] self.lastEvent[1] = [(START_ELEMENT, node), None]
@ -68,26 +66,45 @@ def endElementNS(self, name, tagName):
#self.events.append((END_ELEMENT, node)) #self.events.append((END_ELEMENT, node))
self.curNode = node.parentNode self.curNode = node.parentNode
def startElement(self, name, attrs):
node = self.document.createElement(name)
for aname,value in attrs.items():
attr = self.document.createAttribute(aname)
attr.value = value
node.setAttributeNode(attr)
parent = self.curNode
parent.appendChild(node)
node.parentNode = parent
self.curNode = node
self.lastEvent[1] = [(START_ELEMENT, node), None]
self.lastEvent = self.lastEvent[1]
#self.events.append((START_ELEMENT, node))
def endElement(self, name):
node = self.curNode
self.lastEvent[1] = [(END_ELEMENT, node), None]
self.lastEvent = self.lastEvent[1]
#self.events.append((END_ELEMENT, node))
self.curNode = node.parentNode
def comment(self, s): def comment(self, s):
node = self.document.createComment(s) node = self.document.createComment(s)
parent = self.curNode parent = self.curNode
parent.appendChild(node)
node.parentNode = parent node.parentNode = parent
if parent.childNodes:
node.previousSibling = parent.childNodes[-1]
node.previousSibling.nextSibling = node
self.lastEvent[1] = [(COMMENT, node), None] self.lastEvent[1] = [(COMMENT, node), None]
self.lastEvent = self.lastEvent[1] self.lastEvent = self.lastEvent[1]
#self.events.append((COMMENT, node)) #self.events.append((COMMENT, node))
def processingInstruction(self, target, data): def processingInstruction(self, target, data):
node = self.document.createProcessingInstruction(target, data) node = self.document.createProcessingInstruction(target, data)
#self.appendChild(node)
parent = self.curNode parent = self.curNode
parent.appendChild(node)
node.parentNode = parent node.parentNode = parent
if parent.childNodes:
node.previousSibling = parent.childNodes[-1]
node.previousSibling.nextSibling = node
self.lastEvent[1] = [(PROCESSING_INSTRUCTION, node), None] self.lastEvent[1] = [(PROCESSING_INSTRUCTION, node), None]
self.lastEvent = self.lastEvent[1] self.lastEvent = self.lastEvent[1]
#self.events.append((PROCESSING_INSTRUCTION, node)) #self.events.append((PROCESSING_INSTRUCTION, node))
@ -95,17 +112,17 @@ def processingInstruction(self, target, data):
def ignorableWhitespace(self, chars): def ignorableWhitespace(self, chars):
node = self.document.createTextNode(chars[start:start + length]) node = self.document.createTextNode(chars[start:start + length])
parent = self.curNode parent = self.curNode
parent.appendChild(node)
node.parentNode = parent node.parentNode = parent
if parent.childNodes:
node.previousSibling = parent.childNodes[-1]
node.previousSibling.nextSibling = node
self.lastEvent[1] = [(IGNORABLE_WHITESPACE, node), None] self.lastEvent[1] = [(IGNORABLE_WHITESPACE, node), None]
self.lastEvent = self.lastEvent[1] self.lastEvent = self.lastEvent[1]
#self.events.append((IGNORABLE_WHITESPACE, node)) #self.events.append((IGNORABLE_WHITESPACE, node))
def characters(self, chars): def characters(self, chars):
node = self.document.createTextNode(chars) node = self.document.createTextNode(chars)
node.parentNode = self.curNode parent = self.curNode
parent.appendChild(node)
node.parentNode = parent
self.lastEvent[1] = [(CHARACTERS, node), None] self.lastEvent[1] = [(CHARACTERS, node), None]
self.lastEvent = self.lastEvent[1] self.lastEvent = self.lastEvent[1]
@ -160,8 +177,6 @@ def expandNode(self, node):
token, cur_node = event token, cur_node = event
if cur_node is node: if cur_node is node:
return return
if token != END_ELEMENT:
cur_node.parentNode.appendChild(cur_node)
event = self.getEvent() event = self.getEvent()
def getEvent(self): def getEvent(self):