diff options
| -rw-r--r-- | magic.py | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -18,6 +18,7 @@ Usage: """ import sys +import glob import os.path import ctypes import ctypes.util @@ -144,12 +145,14 @@ if dll: if not libmagic or not libmagic._name: import sys platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib', - '/usr/local/lib/libmagic.dylib', - '/usr/local/Cellar/libmagic/5.10/lib/libmagic.dylib'], + '/usr/local/lib/libmagic.dylib'] + + # Assumes there will only be one version installed + glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'), 'win32': ['magic1.dll']} for dll in platform_to_lib.get(sys.platform, []): try: libmagic = ctypes.CDLL(dll) + break except OSError: pass |