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 19:04:40 +00:00
parent 690ce9b353
commit 00cfc379d6
2 changed files with 5 additions and 2 deletions

View file

@ -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