[Python-checkins] cpython: Fix imports in xml.dom.

[florent.xicluna]

http://hg.python.org/cpython/rev/ed6ddd59bf2c
changeset:   73928:ed6ddd59bf2c
user:        Florent Xicluna <florent.xicluna at gmail.com>
date:        Sat Dec 10 21:14:53 2011 +0100
summary:
  Fix imports in xml.dom.

files:
  Lib/test/test_minidom.py |  2 +-
  Lib/xml/dom/pulldom.py   |  6 +-----
  2 files changed, 2 insertions(+), 6 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
@@ -47,7 +47,7 @@
 
     def checkWholeText(self, node, s):
         t = node.wholeText
-        self.confirm(t == s, "looking for %s, found %s" % (repr(s), repr(t)))
+        self.confirm(t == s, "looking for %r, found %r" % (s, t))
 
     def testParseFromFile(self):
         with open(tstfile) as file:
diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py
--- a/Lib/xml/dom/pulldom.py
+++ b/Lib/xml/dom/pulldom.py
@@ -1,6 +1,5 @@
 import xml.sax
 import xml.sax.handler
-import types
 
 START_ELEMENT = "START_ELEMENT"
 END_ELEMENT = "END_ELEMENT"
@@ -334,10 +333,7 @@
     return DOMEventStream(stream, parser, bufsize)
 
 def parseString(string, parser=None):
-    try:
-        from io import StringIO
-    except ImportError:
-        from io import StringIO
+    from io import StringIO
 
     bufsize = len(string)
     buf = StringIO(string)

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