[Python-checkins] r72355 - in python/branches/release30-maint: Lib/ctypes/util.py Misc/NEWS

[thomas.heller]

Author: thomas.heller
Date: Tue May  5 21:33:26 2009
New Revision: 72355

Log:
Merged revisions 72354 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72354 | thomas.heller | 2009-05-05 21:04:40 +0200 (Di, 05 Mai 2009) | 10 lines
  
  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)
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/ctypes/util.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/ctypes/util.py
==============================================================================
--- python/branches/release30-maint/Lib/ctypes/util.py	(original)
+++ python/branches/release30-maint/Lib/ctypes/util.py	Tue May  5 21:33:26 2009
@@ -49,12 +49,12 @@
         # 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
 

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Tue May  5 21:33:26 2009
@@ -55,6 +55,9 @@
 Library
 -------
 
+- Issue #4875: On win32, ctypes.util.find_library does no longer
+  return directories.
+
 - Issue #2245: aifc now skips chunk types it doesn't recognize, per spec.
 
 - Issue #4305: ctypes should now build again on mipsel-linux-gnu