updated with new version from Stéphane Bidoul Daniel

* python/libxsl.py: updated with new version from Stéphane Bidoul
Daniel

diff --git a/ChangeLog b/ChangeLog
index 58979b1..5d58c26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 24 13:58:48 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+       * python/libxsl.py: updated with new version from Stéphane Bidoul
+
 Sat Nov 23 22:49:08 CET 2002 Igor Zlatkovic <igor@stud.fh-frankfurt.de>
 
        * win32/libxslt.def.src: exported new functions

diff --git a/python/libxsl.py b/python/libxsl.py
index 125630b..ef88cad 100644 (file)
--- a/python/libxsl.py
+++ b/python/libxsl.py
@@ -4,45 +4,50 @@
 # loader to work in that mode if feasible
 #
 import sys
-try:
-    from dl import RTLD_GLOBAL, RTLD_NOW
-except ImportError:
-    RTLD_GLOBAL = -1
-    RTLD_NOW = -1
-    try:
-        import os
-       osname = os.uname()[0]
-       if osname == 'Linux':
-           RTLD_GLOBAL = 0x00100
-           RTLD_NOW = 0x00002
-       #
-       # is there a better method ?
-       #
-       else:
-           print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
-                 "on this platform: %s" % (osname)
-    except:
-       print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
-             "on this platform: %s" % (osname)
-
-if RTLD_GLOBAL != -1 and RTLD_NOW != -1:
-    try:
-       flags = sys.getdlopenflags() 
-       sys.setdlopenflags(RTLD_GLOBAL | RTLD_NOW)
-       try:
-           import libxml2mod
-           import libxsltmod
-           import libxml2
-       finally:
-           sys.setdlopenflags(flags)
-    except:
-       import libxml2mod
-       import libxsltmod
-       import libxml2
-else:
+if not hasattr(sys,'getdlopenflags'):
     import libxml2mod
     import libxsltmod
     import libxml2
+else:
+    try:
+        from dl import RTLD_GLOBAL, RTLD_NOW
+    except ImportError:
+        RTLD_GLOBAL = -1
+        RTLD_NOW = -1
+        try:
+            import os
+            osname = os.uname()[0]
+            if osname == 'Linux':
+                RTLD_GLOBAL = 0x00100
+                RTLD_NOW = 0x00002
+            #
+            # is there a better method ?
+            #
+            else:
+                print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
+                      "on this platform: %s" % (osname)
+        except:
+            print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
+                  "on this platform: %s" % (osname)
+
+    if RTLD_GLOBAL != -1 and RTLD_NOW != -1:
+        try:
+            flags = sys.getdlopenflags() 
+            sys.setdlopenflags(RTLD_GLOBAL | RTLD_NOW)
+            try:
+                import libxml2mod
+                import libxsltmod
+                import libxml2
+            finally:
+                sys.setdlopenflags(flags)
+        except:
+            import libxml2mod
+            import libxsltmod
+            import libxml2
+    else:
+        import libxml2mod
+        import libxsltmod
+        import libxml2
 
 #
 # Everything below this point is automatically generated