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 37e4b037ec4e29a1aec3408459ed6cb13486e186..794b895aa064898c35b6c990341ff16b3478a8ba 100644 (file)
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -49,12 +49,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 b0948100c6f9a57e243919a79c95c1ee85ace4bc..c0940f41b58f285fc6b44396d57fbe5538d15ba5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,9 @@ Installation
 Library
 -------
 
+- Issue #4875: On win32, ctypes.util.find_library does no longer
+  return directories.
+
 - Issue #5142: Add the ability to skip modules while stepping to pdb.
 
 - Issue #1309567: Fix linecache behavior of stripping subdirectories when