Merged revisions 72352 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72352 | thomas.heller | 2009-05-05 20:55:47 +0200 (Di, 05 Mai 2009) | 3 lines

  Fix Issue #4875: find_library can return directories instead of files
  (on win32)
........

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 433d0d9bf660b61e658a2c77a4926797654a8aae..35b0b1e50e9b880375b541745f4be4b87ed2c518 100644 (file)
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -52,12 +52,12 @@ if os.name == "nt":
         # 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):
+            if os.path.isfile(fname):
                 return fname
             if fname.lower().endswith(".dll"):
                 continue
             fname = fname + ".dll"
-            if os.path.exists(fname):
+            if os.path.isfile(fname):
                 return fname
         return None
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 69078c11a10913e8f2ea77f77007cef425df20fe..f5c7a5e5a07aa7254b6f0466382ef38cf9e96e39 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4875: On win32, ctypes.util.find_library does no longer
+  return directories.
+
 - Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when
   extracting a file to the root directory.