[Python-checkins] r72354 - in python/branches/py3k: Lib/ctypes/util.py Misc/NEWS

thomas.heller python-checkins at python.org
Tue May 5 21:04:40 CEST 2009


Author: thomas.heller
Date: Tue May  5 21:04:40 2009
New Revision: 72354

Log:
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/py3k/   (props changed)
   python/branches/py3k/Lib/ctypes/util.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/ctypes/util.py
==============================================================================
--- python/branches/py3k/Lib/ctypes/util.py	(original)
+++ python/branches/py3k/Lib/ctypes/util.py	Tue May  5 21:04:40 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/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue May  5 21:04:40 2009
@@ -127,6 +127,9 @@
 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


More information about the Python-checkins mailing list