Imported Upstream version 2.8.0+dfsg1

1 files changed, 8 insertions, 13 deletions

diff --git a/python/tests/readererr.py b/python/tests/readererr.py
index c8ceba5..0dad36e 100755..100644
--- a/python/tests/readererr.py
+++ b/python/tests/readererr.py
@@ -3,13 +3,8 @@
 # this tests the basic APIs of the XmlTextReader interface
 #
 import libxml2
+import StringIO
 import sys
-try:
-    import StringIO
-    str_io = StringIO.StringIO
-except:
-    import io
-    str_io = io.StringIO
 
 # Memory debug specific
 libxml2.debugMemory(1)
@@ -22,7 +17,7 @@ def myErrorHandler(arg,msg,severity,locator):
     global err
     err = err + "%s (%d) %s:%d:%s" % (arg,severity,locator.BaseURI(),locator.LineNumber(),msg)
 
-f = str_io("""<a xmlns="foo"><b b1="b1"/><c>content of c</a>""")
+f = StringIO.StringIO("""<a xmlns="foo"><b b1="b1"/><c>content of c</a>""")
 input = libxml2.inputBuffer(f)
 reader = input.newTextReader("test1")
 reader.SetErrorHandler(myErrorHandler,"-->")
@@ -30,14 +25,14 @@ while reader.Read() == 1:
     pass
 
 if err != expect:
-    print("error")
-    print("received %s" %(err))
-    print("expected %s" %(expect))
+    print "error"
+    print "received %s" %(err)
+    print "expected %s" %(expect)
     sys.exit(1)
 
 reader.SetErrorHandler(None,None)
 if reader.GetErrorHandler() != (None,None):
-    print("GetErrorHandler failed")
+    print "GetErrorHandler failed"
     sys.exit(1)
 
 #
@@ -50,7 +45,7 @@ del reader
 # Memory debug specific
 libxml2.cleanupParser()
 if libxml2.debugMemory(1) == 0:
-    print("OK")
+    print "OK"
 else:
-    print("Memory leak %d bytes" % (libxml2.debugMemory(1)))
+    print "Memory leak %d bytes" % (libxml2.debugMemory(1))
     libxml2.dumpMemory()