From ae0d49b2b48a0865738a49e43847ce99c143ba9f Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Tue, 5 May 2009 19:33:26 +0000 Subject: [PATCH] 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) ........ ................ --- Lib/ctypes/util.py | 4 ++-- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 37e4b037ec4e..794b895aa064 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -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 diff --git a/Misc/NEWS b/Misc/NEWS index ad550e87b5bb..2f9d99e0bfb5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -55,6 +55,9 @@ Core and Builtins 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 -- 2.47.3