[Python-checkins] CVS: python/dist/src/Lib/xml/dom minidom.py,1.32,1.32.4.1

2001年7月07日 15:55:31 -0700

Update of /cvsroot/python/python/dist/src/Lib/xml/dom
In directory usw-pr-cvs1:/tmp/cvs-serv24450/mergedescr/dist/src/Lib/xml/dom
Modified Files:
 Tag: descr-branch
	minidom.py 
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.
Index: minidom.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/dom/minidom.py,v
retrieving revision 1.32
retrieving revision 1.32.4.1
diff -C2 -r1.32 -r1.32.4.1
*** minidom.py	2001年04月05日 14:41:30	1.32
--- minidom.py	2001年07月07日 22:55:29	1.32.4.1
***************
*** 280,284 ****
 for node in parent.childNodes:
 if node.nodeType == Node.ELEMENT_NODE:
! if ((localName == "*" or node.tagName == localName) and
 (nsURI == "*" or node.namespaceURI == nsURI)):
 rc.append(node)
--- 280,284 ----
 for node in parent.childNodes:
 if node.nodeType == Node.ELEMENT_NODE:
! if ((localName == "*" or node.localName == localName) and
 (nsURI == "*" or node.namespaceURI == nsURI)):
 rc.append(node)
***************
*** 552,556 ****

 def getElementsByTagNameNS(self, namespaceURI, localName):
! _getElementsByTagNameNSHelper(self, namespaceURI, localName, [])

 def __repr__(self):
--- 552,556 ----

 def getElementsByTagNameNS(self, namespaceURI, localName):
! return _getElementsByTagNameNSHelper(self, namespaceURI, localName, [])

 def __repr__(self):
***************
*** 880,890 ****
 return a

- def getElementsByTagNameNS(self, namespaceURI, localName):
- _getElementsByTagNameNSHelper(self, namespaceURI, localName)
- 
 def getElementsByTagName(self, name):
! rc = []
! _getElementsByTagNameHelper(self, name, rc)
! return rc

 def writexml(self, writer, indent="", addindent="", newl=""):
--- 880,888 ----
 return a

 def getElementsByTagName(self, name):
! return _getElementsByTagNameHelper(self, name, [])
! 
! def getElementsByTagNameNS(self, namespaceURI, localName):
! return _getElementsByTagNameNSHelper(self, namespaceURI, localName, [])

 def writexml(self, writer, indent="", addindent="", newl=""):