Imported Upstream version 2.8.0+dfsg1

1 files changed, 6 insertions, 11 deletions

diff --git a/python/tests/resolver.py b/python/tests/resolver.py
index 6f21f52..9f4a478 100755
--- a/python/tests/resolver.py
+++ b/python/tests/resolver.py
@@ -1,25 +1,20 @@
 #!/usr/bin/python -u
 import sys
 import libxml2
-try:
-    import StringIO
-    str_io = StringIO.StringIO
-except:
-    import io
-    str_io = io.StringIO
+import StringIO
 
 # Memory debug specific
 libxml2.debugMemory(1)
 
 def myResolver(URL, ID, ctxt):
-    return(str_io("<foo/>"))
+    return(StringIO.StringIO("<foo/>"))
 
 libxml2.setEntityLoader(myResolver)
 
 doc = libxml2.parseFile("doesnotexist.xml")
 root = doc.children
 if root.name != "foo":
-    print("root element name error")
+    print "root element name error"
     sys.exit(1)
 doc.freeDoc()
 
@@ -28,7 +23,7 @@ while i < 5000:
     doc = libxml2.parseFile("doesnotexist.xml")
     root = doc.children
     if root.name != "foo":
-        print("root element name error")
+        print "root element name error"
         sys.exit(1)
     doc.freeDoc()
     i = i + 1
@@ -37,8 +32,8 @@ while i < 5000:
 # 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()