[Python-checkins] cpython (merge 3.3 -> default): #18465: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/47770b408321
changeset:   85089:47770b408321
parent:      85087:7bf1f8892df5
parent:      85088:4daa18b5ad49
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Aug 10 18:30:57 2013 +0300
summary:
  #18465: merge with 3.3.

files:
  Lib/test/test_minidom.py |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -1,7 +1,7 @@
 # test for xml.dom.minidom
 
 import pickle
-from test.support import verbose, run_unittest, findfile
+from test.support import run_unittest, findfile
 import unittest
 
 import xml.dom.minidom
@@ -310,9 +310,10 @@
         self.confirm(len(child.attributes) == 0
                 and child.getAttributeNode("spam") is None)
         dom2 = Document()
-        child2 = dom2.appendChild(dom.createElement("foo"))
-        self.assertRaises(xml.dom.NotFoundErr, child.removeAttributeNode,
-            node)
+        child2 = dom2.appendChild(dom2.createElement("foo"))
+        node2 = child2.getAttributeNode("spam")
+        self.assertRaises(xml.dom.NotFoundErr, child2.removeAttributeNode,
+            node2)
         dom.unlink()
 
     def testHasAttribute(self):
@@ -607,7 +608,7 @@
     def testHasChildNodes(self):
         dom = parseString("<doc><foo/></doc>")
         doc = dom.documentElement
-        self.assertTrue(dom.hasChildNodes())
+        self.assertTrue(doc.hasChildNodes())
         dom2 = parseString("<doc/>")
         doc2 = dom2.documentElement
         self.assertFalse(doc2.hasChildNodes())

-- 
Repository URL: http://hg.python.org/cpython