Add missing svn properties.

1 files changed, 122 insertions, 122 deletions

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 4b8057e..d756c1c 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -1,122 +1,122 @@
-import sys, os

-import ctypes

-

-# find_library(name) returns the pathname of a library, or None.

-if os.name == "nt":

-    def find_library(name):

-        # See MSDN for the REAL search order.

-        for directory in os.environ['PATH'].split(os.pathsep):

-            fname = os.path.join(directory, name)

-            if os.path.exists(fname):

-                return fname

-            if fname.lower().endswith(".dll"):

-                continue

-            fname = fname + ".dll"

-            if os.path.exists(fname):

-                return fname

-        return None

-

-if os.name == "ce":

-    # search path according to MSDN:

-    # - absolute path specified by filename

-    # - The .exe launch directory

-    # - the Windows directory

-    # - ROM dll files (where are they?)

-    # - OEM specified search path: HKLM\Loader\SystemPath

-    def find_library(name):

-        return name

-

-if os.name == "posix" and sys.platform == "darwin":

-    from ctypes.macholib.dyld import dyld_find as _dyld_find

-    def find_library(name):

-        possible = ['lib%s.dylib' % name,

-                    '%s.dylib' % name,

-                    '%s.framework/%s' % (name, name)]

-        for name in possible:

-            try:

-                return _dyld_find(name)

-            except ValueError:

-                continue

-        return None

-

-elif os.name == "posix":

-    # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump

-    import re, tempfile

-

-    def _findLib_gcc(name):

-        expr = '[^\(\)\s]*lib%s\.[^\(\)\s]*' % name

-        cmd = 'if type gcc &>/dev/null; then CC=gcc; else CC=cc; fi;' \

-              '$CC -Wl,-t -o /dev/null 2>&1 -l' + name

-        try:

-            fdout, outfile =  tempfile.mkstemp()

-            fd = os.popen(cmd)

-            trace = fd.read()

-            err = fd.close()

-        finally:

-            try:

-                os.unlink(outfile)

-            except OSError, e:

-                if e.errno != errno.ENOENT:

-                    raise

-        res = re.search(expr, trace)

-        if not res:

-            return None

-        return res.group(0)

-

-    def _findLib_ld(name):

-        expr = '/[^\(\)\s]*lib%s\.[^\(\)\s]*' % name

-        res = re.search(expr, os.popen('/sbin/ldconfig -p 2>/dev/null').read())

-        if not res:

-            # Hm, this works only for libs needed by the python executable.

-            cmd = 'ldd %s 2>/dev/null' % sys.executable

-            res = re.search(expr, os.popen(cmd).read())

-            if not res:

-                return None

-        return res.group(0)

-

-    def _get_soname(f):

-        cmd = "objdump -p -j .dynamic 2>/dev/null " + f

-        res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())

-        if not res:

-            return None

-        return res.group(1)

-

-    def find_library(name):

-        lib = _findLib_ld(name) or _findLib_gcc(name)

-        if not lib:

-            return None

-        return _get_soname(lib)

-

-################################################################

-# test code

-

-def test():

-    from ctypes import cdll

-    if os.name == "nt":

-        print cdll.msvcrt

-        print cdll.load("msvcrt")

-        print find_library("msvcrt")

-

-    if os.name == "posix":

-        # find and load_version

-        print find_library("m")

-        print find_library("c")

-        print find_library("bz2")

-

-        # getattr

-##        print cdll.m

-##        print cdll.bz2

-

-        # load

-        if sys.platform == "darwin":

-            print cdll.LoadLibrary("libm.dylib")

-            print cdll.LoadLibrary("libcrypto.dylib")

-            print cdll.LoadLibrary("libSystem.dylib")

-            print cdll.LoadLibrary("System.framework/System")

-        else:

-            print cdll.LoadLibrary("libm.so")

-            print cdll.LoadLibrary("libcrypt.so")

-            print find_library("crypt")

-

-if __name__ == "__main__":

-    test()

+import sys, os
+import ctypes
+
+# find_library(name) returns the pathname of a library, or None.
+if os.name == "nt":
+    def find_library(name):
+        # See MSDN for the REAL search order.
+        for directory in os.environ['PATH'].split(os.pathsep):
+            fname = os.path.join(directory, name)
+            if os.path.exists(fname):
+                return fname
+            if fname.lower().endswith(".dll"):
+                continue
+            fname = fname + ".dll"
+            if os.path.exists(fname):
+                return fname
+        return None
+
+if os.name == "ce":
+    # search path according to MSDN:
+    # - absolute path specified by filename
+    # - The .exe launch directory
+    # - the Windows directory
+    # - ROM dll files (where are they?)
+    # - OEM specified search path: HKLM\Loader\SystemPath
+    def find_library(name):
+        return name
+
+if os.name == "posix" and sys.platform == "darwin":
+    from ctypes.macholib.dyld import dyld_find as _dyld_find
+    def find_library(name):
+        possible = ['lib%s.dylib' % name,
+                    '%s.dylib' % name,
+                    '%s.framework/%s' % (name, name)]
+        for name in possible:
+            try:
+                return _dyld_find(name)
+            except ValueError:
+                continue
+        return None
+
+elif os.name == "posix":
+    # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
+    import re, tempfile
+
+    def _findLib_gcc(name):
+        expr = '[^\(\)\s]*lib%s\.[^\(\)\s]*' % name
+        cmd = 'if type gcc &>/dev/null; then CC=gcc; else CC=cc; fi;' \
+              '$CC -Wl,-t -o /dev/null 2>&1 -l' + name
+        try:
+            fdout, outfile =  tempfile.mkstemp()
+            fd = os.popen(cmd)
+            trace = fd.read()
+            err = fd.close()
+        finally:
+            try:
+                os.unlink(outfile)
+            except OSError, e:
+                if e.errno != errno.ENOENT:
+                    raise
+        res = re.search(expr, trace)
+        if not res:
+            return None
+        return res.group(0)
+
+    def _findLib_ld(name):
+        expr = '/[^\(\)\s]*lib%s\.[^\(\)\s]*' % name
+        res = re.search(expr, os.popen('/sbin/ldconfig -p 2>/dev/null').read())
+        if not res:
+            # Hm, this works only for libs needed by the python executable.
+            cmd = 'ldd %s 2>/dev/null' % sys.executable
+            res = re.search(expr, os.popen(cmd).read())
+            if not res:
+                return None
+        return res.group(0)
+
+    def _get_soname(f):
+        cmd = "objdump -p -j .dynamic 2>/dev/null " + f
+        res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
+        if not res:
+            return None
+        return res.group(1)
+
+    def find_library(name):
+        lib = _findLib_ld(name) or _findLib_gcc(name)
+        if not lib:
+            return None
+        return _get_soname(lib)
+
+################################################################
+# test code
+
+def test():
+    from ctypes import cdll
+    if os.name == "nt":
+        print cdll.msvcrt
+        print cdll.load("msvcrt")
+        print find_library("msvcrt")
+
+    if os.name == "posix":
+        # find and load_version
+        print find_library("m")
+        print find_library("c")
+        print find_library("bz2")
+
+        # getattr
+##        print cdll.m
+##        print cdll.bz2
+
+        # load
+        if sys.platform == "darwin":
+            print cdll.LoadLibrary("libm.dylib")
+            print cdll.LoadLibrary("libcrypto.dylib")
+            print cdll.LoadLibrary("libSystem.dylib")
+            print cdll.LoadLibrary("System.framework/System")
+        else:
+            print cdll.LoadLibrary("libm.so")
+            print cdll.LoadLibrary("libcrypt.so")
+            print find_library("crypt")
+
+if __name__ == "__main__":
+    test()