Merge branch 'master' of git://anonscm.debian.org/debian-xml-sgml/libxml2

Conflicts:
	debian/changelog
	debian/control
	debian/rules

1 files changed, 22 insertions, 17 deletions

diff --git a/python/tests/readernext.py b/python/tests/readernext.py
index b01a49d..fcb9ae3 100755
--- a/python/tests/readernext.py
+++ b/python/tests/readernext.py
@@ -4,65 +4,70 @@
 # this tests the next API 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)
 
-f = StringIO.StringIO("""<a><b><c /></b><d>content of d</d></a>""")
+f = str_io("""<a><b><c /></b><d>content of d</d></a>""")
 input = libxml2.inputBuffer(f)
 reader = input.newTextReader("test_next")
 ret = reader.Read()
 if ret != 1:
-    print "test_next: Error reading to first element"
+    print("test_next: Error reading to first element")
     sys.exit(1)
 if reader.Name() != "a" or reader.IsEmptyElement() != 0 or \
    reader.NodeType() != 1 or reader.HasAttributes() != 0:
-    print "test_next: Error reading the first element"
+    print("test_next: Error reading the first element")
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print "test_next: Error reading to second element"
+    print("test_next: Error reading to second element")
     sys.exit(1)
 if reader.Name() != "b" or reader.IsEmptyElement() != 0 or \
    reader.NodeType() != 1 or reader.HasAttributes() != 0:
-    print "test_next: Error reading the second element"
+    print("test_next: Error reading the second element")
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print "test_next: Error reading to third element"
+    print("test_next: Error reading to third element")
     sys.exit(1)
 if reader.Name() != "c" or reader.NodeType() != 1 or \
    reader.HasAttributes() != 0:
-    print "test_next: Error reading the third element"
+    print("test_next: Error reading the third element")
     sys.exit(1)
 ret = reader.Read()
 if ret != 1:
-    print "test_next: Error reading to end of third element"
+    print("test_next: Error reading to end of third element")
     sys.exit(1)
 if reader.Name() != "b" or reader.NodeType() != 15:
-    print "test_next: Error reading to end of second element"
+    print("test_next: Error reading to end of second element")
     sys.exit(1)
 ret = reader.Next()
 if ret != 1:
-    print "test_next: Error moving to third element"
+    print("test_next: Error moving to third element")
     sys.exit(1)
 if reader.Name() != "d" or reader.IsEmptyElement() != 0 or \
    reader.NodeType() != 1 or reader.HasAttributes() != 0:
-    print "test_next: Error reading third element"
+    print("test_next: Error reading third element")
     sys.exit(1)
 ret = reader.Next()
 if ret != 1:
-    print "test_next: Error reading to end of first element"
+    print("test_next: Error reading to end of first element")
     sys.exit(1)
 if reader.Name() != "a" or reader.IsEmptyElement() != 0 or \
    reader.NodeType() != 15 or reader.HasAttributes() != 0:
-    print "test_next: Error reading the end of first element"
+    print("test_next: Error reading the end of first element")
     sys.exit(1)
 ret = reader.Read()
 if ret != 0:
-    print "test_next: Error reading to end of document"
+    print("test_next: Error reading to end of document")
     sys.exit(1)
 
 #
@@ -75,7 +80,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()