From 3e7f9ce2411674ffe68cb17061b7dadc7dfc0661 Mon Sep 17 00:00:00 2001 From: Aleksandr Gantimurov Date: Wed, 18 Aug 2021 15:09:29 +0300 Subject: [PATCH] bugfix: add path to load libmagic bin on Windows --- magic/loader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/magic/loader.py b/magic/loader.py index 931f161..38d1e5c 100644 --- a/magic/loader.py +++ b/magic/loader.py @@ -22,11 +22,12 @@ def _lib_candidates(): elif sys.platform in ('win32', 'cygwin'): prefixes = ['libmagic', 'magic1', 'cygmagic-1', 'libmagic-1', 'msys-magic-1'] - + loader_path = os.path.dirname(__file__) for i in prefixes: # find_library searches in %PATH% but not the current directory, # so look for both - yield './%s.dll' % (i,) + yield '.\%s.dll' % (i,) + yield '%s\libmagic\%s.dll' % (loader_path, i) yield find_library(i) elif sys.platform == 'linux':