Commit 54e02486 authored by Thomas Heller's avatar Thomas Heller

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)
........
parent 04e19077
......@@ -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
......
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment