| version 1.1.1.1, 2012/02/21 23:38:00 | version 1.1.1.3, 2014/06/15 19:53:33 | 
| Line 32  except: | Line 32  except: | 
 | if WITHDLLS: | if WITHDLLS: | 
 | # libxml dlls (expected in ROOT/bin) | # libxml dlls (expected in ROOT/bin) | 
 | dlls = [ 'iconv.dll','libxml2.dll','libxslt.dll','libexslt.dll' ] | dlls = [ 'iconv.dll','libxml2.dll','libxslt.dll','libexslt.dll' ] | 
| dlls = map(lambda dll: os.path.join(ROOT,'bin',dll),dlls) | dlls = [os.path.join(ROOT,'bin',dll) for dll in dlls] | 
 |  |  | 
 | # create __init__.py for the libxmlmods package | # create __init__.py for the libxmlmods package | 
 | if not os.path.exists("libxmlmods"): | if not os.path.exists("libxmlmods"): | 
| Line 70  for dir in includes_dir: | Line 70  for dir in includes_dir: | 
 | break; | break; | 
 |  |  | 
 | if xml_includes == "": | 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) | sys.exit(1) | 
 |  |  | 
 | iconv_includes="" | iconv_includes="" | 
| Line 80  for dir in includes_dir: | Line 80  for dir in includes_dir: | 
 | break; | break; | 
 |  |  | 
 | if iconv_includes == "": | 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) | sys.exit(1) | 
 |  |  | 
 | # those are added in the linker search path for libraries | # those are added in the linker search path for libraries | 
| Line 103  if missing("libxml2-py.c") or missing("libxml2.py"): | Line 103  if missing("libxml2-py.c") or missing("libxml2.py"): | 
 | except: | except: | 
 | import generator | import generator | 
 | except: | except: | 
| print "failed to find and generate stubs for libxml2, aborting ..." | print("failed to find and generate stubs for libxml2, aborting ...") | 
| print sys.exc_type, sys.exc_value | print(sys.exc_info()[0], sys.exc_info()[1]) | 
 | sys.exit(1) | sys.exit(1) | 
 |  |  | 
 | head = open("libxml.py", "r") | head = open("libxml.py", "r") | 
| Line 124  if missing("libxml2-py.c") or missing("libxml2.py"): | Line 124  if missing("libxml2-py.c") or missing("libxml2.py"): | 
 | with_xslt=0 | with_xslt=0 | 
 | if missing("libxslt-py.c") or missing("libxslt.py"): | if missing("libxslt-py.c") or missing("libxslt.py"): | 
 | if missing("xsltgenerator.py") or missing("libxslt-api.xml"): | 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: | else: | 
 | try: | try: | 
 | import xsltgenerator | import xsltgenerator | 
 | except: | except: | 
| print "failed to generate stubs for libxslt, aborting ..." | print("failed to generate stubs for libxslt, aborting ...") | 
| print sys.exc_type, sys.exc_value | print(sys.exc_info()[0], sys.exc_info()[1]) | 
 | else: | else: | 
 | head = open("libxsl.py", "r") | head = open("libxsl.py", "r") | 
 | generated = open("libxsltclass.py", "r") | generated = open("libxsltclass.py", "r") | 
| Line 157  if with_xslt == 1: | Line 157  if with_xslt == 1: | 
 | break; | break; | 
 |  |  | 
 | if xslt_includes == "": | 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 | with_xslt = 0 | 
 |  |  | 
 |  |  | 
| Line 226  else: | Line 226  else: | 
 | setup (name = "libxml2-python", | setup (name = "libxml2-python", | 
 | # On *nix, the version number is created from setup.py.in | # On *nix, the version number is created from setup.py.in | 
 | # On windows, it is set by configure.js | # On windows, it is set by configure.js | 
| version = "2.7.8", | version = "2.9.1", | 
 | description = descr, | description = descr, | 
 | author = "Daniel Veillard", | author = "Daniel Veillard", | 
 | author_email = "veillard@redhat.com", | author_email = "veillard@redhat.com", |