1 files changed, 29 insertions, 34 deletions

diff --git a/python/tests/reader3.py b/python/tests/reader3.py
index 4302b6c..2458c89 100755
--- a/python/tests/reader3.py
+++ b/python/tests/reader3.py
@@ -3,13 +3,8 @@
 # this tests the entities substitutions with the XmlTextReader interface
 #
 import sys
+import StringIO
 import libxml2
-try:
-    import StringIO
-    str_io = StringIO.StringIO
-except:
-    import io
-    str_io = io.StringIO
 
 docstr="""<?xml version='1.0'?>
 <!DOCTYPE doc [
@@ -23,90 +18,90 @@ libxml2.debugMemory(1)
 #
 # First test, normal don't substitute entities.
 #
-f = str_io(docstr)
+f = StringIO.StringIO(docstr)
 input = libxml2.inputBuffer(f)
 reader = input.newTextReader("test_noent")
 ret = reader.Read()
 if ret != 1:
-    print("Error reading to root")
+    print "Error reading to root"
     sys.exit(1)
 if reader.Name() == "doc" or reader.NodeType() == 10:
     ret = reader.Read()
 if ret != 1:
-    print("Error reading to root")
+    print "Error reading to root"
     sys.exit(1)
 if reader.Name() != "doc" or reader.NodeType() != 1:
-    print("test_normal: Error reading the root element")
+    print "test_normal: Error reading the root element"
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print("test_normal: Error reading to the entity")
+    print "test_normal: Error reading to the entity"
     sys.exit(1)
 if reader.Name() != "tst" or reader.NodeType() != 5:
-    print("test_normal: Error reading the entity")
+    print "test_normal: Error reading the entity"
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print("test_normal: Error reading to the end of root")
+    print "test_normal: Error reading to the end of root"
     sys.exit(1)
 if reader.Name() != "doc" or reader.NodeType() != 15:
-    print("test_normal: Error reading the end of the root element")
+    print "test_normal: Error reading the end of the root element"
     sys.exit(1)
 ret = reader.Read()
 if ret != 0:
-    print("test_normal: Error detecting the end")
+    print "test_normal: Error detecting the end"
     sys.exit(1)
 
 #
 # Second test, completely substitute the entities.
 #
-f = str_io(docstr)
+f = StringIO.StringIO(docstr)
 input = libxml2.inputBuffer(f)
 reader = input.newTextReader("test_noent")
 reader.SetParserProp(libxml2.PARSER_SUBST_ENTITIES, 1)
 ret = reader.Read()
 if ret != 1:
-    print("Error reading to root")
+    print "Error reading to root"
     sys.exit(1)
 if reader.Name() == "doc" or reader.NodeType() == 10:
     ret = reader.Read()
 if ret != 1:
-    print("Error reading to root")
+    print "Error reading to root"
     sys.exit(1)
 if reader.Name() != "doc" or reader.NodeType() != 1:
-    print("test_noent: Error reading the root element")
+    print "test_noent: Error reading the root element"
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print("test_noent: Error reading to the entity content")
+    print "test_noent: Error reading to the entity content"
     sys.exit(1)
 if reader.Name() != "p" or reader.NodeType() != 1:
-    print("test_noent: Error reading the p element from entity")
+    print "test_noent: Error reading the p element from entity"
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print("test_noent: Error reading to the text node")
+    print "test_noent: Error reading to the text node"
     sys.exit(1)
 if reader.NodeType() != 3 or reader.Value() != "test":
-    print("test_noent: Error reading the text node")
+    print "test_noent: Error reading the text node"
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print("test_noent: Error reading to the end of p element")
+    print "test_noent: Error reading to the end of p element"
     sys.exit(1)
 if reader.Name() != "p" or reader.NodeType() != 15:
-    print("test_noent: Error reading the end of the p element")
+    print "test_noent: Error reading the end of the p element"
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print("test_noent: Error reading to the end of root")
+    print "test_noent: Error reading to the end of root"
     sys.exit(1)
 if reader.Name() != "doc" or reader.NodeType() != 15:
-    print("test_noent: Error reading the end of the root element")
+    print "test_noent: Error reading the end of the root element"
     sys.exit(1)
 ret = reader.Read()
 if ret != 0:
-    print("test_noent: Error detecting the end")
+    print "test_noent: Error detecting the end"
     sys.exit(1)
 
 #
@@ -127,12 +122,12 @@ simplestruct2_ent="""<descr/>"""
 
 def myResolver(URL, ID, ctxt):
     if URL == "simplestruct2.ent":
-        return(str_io(simplestruct2_ent))
+        return(StringIO.StringIO(simplestruct2_ent))
     return None
 
 libxml2.setEntityLoader(myResolver)
 
-input = libxml2.inputBuffer(str_io(s))
+input = libxml2.inputBuffer(StringIO.StringIO(s))
 reader = input.newTextReader("test3")
 reader.SetParserProp(libxml2.PARSER_SUBST_ENTITIES,1)
 while reader.Read() == 1:
@@ -140,8 +135,8 @@ while reader.Read() == 1:
                                    reader.Depth(),reader.IsEmptyElement())
 
 if res != expect:
-    print("test3 failed: unexpected output")
-    print(res)
+    print "test3 failed: unexpected output"
+    print res
     sys.exit(1)
 
 #
@@ -154,7 +149,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()