Imported Upstream version 2.8.0+dfsg1

1 files changed, 10 insertions, 10 deletions

diff --git a/python/setup.py b/python/setup.py
index f24674c..b985979 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -32,7 +32,7 @@ except:
 if WITHDLLS:
     # libxml dlls (expected in ROOT/bin)
     dlls = [ 'iconv.dll','libxml2.dll','libxslt.dll','libexslt.dll' ]
-    dlls = [os.path.join(ROOT,'bin',dll) for dll in dlls]
+    dlls = map(lambda dll: os.path.join(ROOT,'bin',dll),dlls)
 
     # create __init__.py for the libxmlmods package
     if not os.path.exists("libxmlmods"):
@@ -70,7 +70,7 @@ for dir in includes_dir:
 	break;
 
 if xml_includes == "":
-    print("failed to find headers for libxml2: update includes_dir")
+    print "failed to find headers for libxml2: update includes_dir"
     sys.exit(1)
 
 iconv_includes=""
@@ -80,7 +80,7 @@ for dir in includes_dir:
 	break;
 
 if iconv_includes == "":
-    print("failed to find headers for libiconv: update includes_dir")
+    print "failed to find headers for libiconv: update includes_dir"
     sys.exit(1)
 
 # those are added in the linker search path for libraries
@@ -103,8 +103,8 @@ if missing("libxml2-py.c") or missing("libxml2.py"):
 	except:
 	    import generator
     except:
-	print("failed to find and generate stubs for libxml2, aborting ...")
-	print(sys.exc_info()[0], sys.exc_info()[1])
+	print "failed to find and generate stubs for libxml2, aborting ..."
+	print sys.exc_type, sys.exc_value
 	sys.exit(1)
 
     head = open("libxml.py", "r")
@@ -124,13 +124,13 @@ if missing("libxml2-py.c") or missing("libxml2.py"):
 with_xslt=0
 if missing("libxslt-py.c") or missing("libxslt.py"):
     if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
-        print("libxslt stub generator not found, libxslt not built")
+        print "libxslt stub generator not found, libxslt not built"
     else:
 	try:
 	    import xsltgenerator
 	except:
-	    print("failed to generate stubs for libxslt, aborting ...")
-	    print(sys.exc_info()[0], sys.exc_info()[1])
+	    print "failed to generate stubs for libxslt, aborting ..."
+	    print sys.exc_type, sys.exc_value
 	else:
 	    head = open("libxsl.py", "r")
 	    generated = open("libxsltclass.py", "r")
@@ -157,7 +157,7 @@ if with_xslt == 1:
 	    break;
 
     if xslt_includes == "":
-	print("failed to find headers for libxslt: update includes_dir")
+	print "failed to find headers for libxslt: update includes_dir"
 	with_xslt = 0
 
 
@@ -226,7 +226,7 @@ else:
 setup (name = "libxml2-python",
        # On *nix, the version number is created from setup.py.in
        # On windows, it is set by configure.js
-       version = "2.9.1",
+       version = "2.8.0",
        description = descr,
        author = "Daniel Veillard",
        author_email = "veillard@redhat.com",