Imported Upstream version 2.8.0+dfsg1

1 files changed, 22 insertions, 27 deletions

diff --git a/python/tests/outbuf.py b/python/tests/outbuf.py
index 62761cc..09cd9b5 100755
--- a/python/tests/outbuf.py
+++ b/python/tests/outbuf.py
@@ -1,22 +1,17 @@
 #!/usr/bin/python -u
 import sys
 import libxml2
-try:
-    import StringIO
-    str_io = StringIO.StringIO
-except:
-    import io
-    str_io = io.StringIO
+import StringIO
 
 def testSimpleBufferWrites():
-    f = str_io()
+    f = StringIO.StringIO()
     buf = libxml2.createOutputBuffer(f, "ISO-8859-1")
     buf.write(3, "foo")
     buf.writeString("bar")
     buf.close()
-
+    
     if f.getvalue() != "foobar":
-        print("Failed to save to StringIO")
+        print "Failed to save to StringIO"
         sys.exit(1)
 
 def testSaveDocToBuffer():
@@ -28,15 +23,15 @@ def testSaveDocToBuffer():
 <?xml version="1.0" encoding="UTF-8"?>
 <foo>Hello</foo>
 '''
-    f = str_io()
+    f = StringIO.StringIO()
     buf = libxml2.createOutputBuffer(f, 'UTF-8')
     doc = libxml2.parseDoc(input)
     doc.saveFileTo(buf, 'UTF-8')
     doc.freeDoc()
     if f.getvalue() != expected:
-        print('xmlDoc.saveFileTo() call failed.')
-        print('     got: %s' % repr(f.getvalue()))
-        print('expected: %s' % repr(expected))
+        print 'xmlDoc.saveFileTo() call failed.'
+        print '     got: %s' % repr(f.getvalue())
+        print 'expected: %s' % repr(expected)
         sys.exit(1)
 
 def testSaveFormattedDocToBuffer():
@@ -54,13 +49,13 @@ def testSaveFormattedDocToBuffer():
 ''')
     doc = libxml2.parseDoc(input)
     for i in (0, 1):
-        f = str_io()
+        f = StringIO.StringIO()
         buf = libxml2.createOutputBuffer(f, 'UTF-8')
         doc.saveFormatFileTo(buf, 'UTF-8', i)
         if f.getvalue() != expected[i]:
-            print('xmlDoc.saveFormatFileTo() call failed.')
-            print('     got: %s' % repr(f.getvalue()))
-            print('expected: %s' % repr(expected[i]))
+            print 'xmlDoc.saveFormatFileTo() call failed.'
+            print '     got: %s' % repr(f.getvalue())
+            print 'expected: %s' % repr(expected[i])
             sys.exit(1)
     doc.freeDoc()
 
@@ -74,22 +69,22 @@ def testSaveIntoOutputBuffer():
 <?xml version="1.0" encoding="UTF-8"?>
 <foo>Hello</foo>
 '''
-    f = str_io()
+    f = StringIO.StringIO()
     doc = libxml2.parseDoc(input)
     buf = libxml2.createOutputBuffer(f, 'UTF-8')
     buf.saveFileTo(doc, 'UTF-8')
     if f.getvalue() != expected:
-        print('outputBuffer.saveFileTo() call failed.')
-        print('     got: %s' % repr(f.getvalue()))
-        print('expected: %s' % repr(expected))
+        print 'outputBuffer.saveFileTo() call failed.'
+        print '     got: %s' % repr(f.getvalue())
+        print 'expected: %s' % repr(expected)
         sys.exit(1)
-    f = str_io()
+    f = StringIO.StringIO()
     buf = libxml2.createOutputBuffer(f, 'UTF-8')
     buf.saveFormatFileTo(doc, 'UTF-8', 1)
     if f.getvalue() != expected:
-        print('outputBuffer.saveFormatFileTo() call failed.')
-        print('     got: %s' % repr(f.getvalue()))
-        print('expected: %s' % repr(expected))
+        print 'outputBuffer.saveFormatFileTo() call failed.'
+        print '     got: %s' % repr(f.getvalue())
+        print 'expected: %s' % repr(expected)
         sys.exit(1)
     doc.freeDoc()
 
@@ -104,7 +99,7 @@ if __name__ == '__main__':
 
     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()