Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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)
........
This commit is contained in:
Thomas Heller 2009-05-05 18:59:30 +00:00
parent 04e190779b
commit 54e024862a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/ctypes/util.py
View File

@ -52,12 +52,12 @@ if os.name == "nt":
# See MSDN for the REAL search order. # See MSDN for the REAL search order.
for directory in os.environ['PATH'].split(os.pathsep): for directory in os.environ['PATH'].split(os.pathsep):
fname = os.path.join(directory, name) fname = os.path.join(directory, name)
if os.path.exists(fname): if os.path.isfile(fname):
return fname return fname
if fname.lower().endswith(".dll"): if fname.lower().endswith(".dll"):
continue continue
fname = fname + ".dll" fname = fname + ".dll"
if os.path.exists(fname): if os.path.isfile(fname):
return fname return fname
return None return None

3
Misc/NEWS
View File

@ -40,6 +40,9 @@ Core and Builtins
Library 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 - Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when
extracting a file to the root directory. extracting a file to the root directory.