From a57773e4838112ab44e55d985b68810fecf934a3 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Tue, 5 May 2009 18:55:47 +0000 Subject: [PATCH] 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 433d0d9bf66..35b0b1e50e9 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -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 diff --git a/Misc/NEWS b/Misc/NEWS index d6c6227a876..604c0df48a3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -282,6 +282,9 @@ Core and Builtins 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