summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Hupp <adam@hupp.org>2011-12-29 10:00:56 -0800
committerAdam Hupp <adam@hupp.org>2011-12-29 10:01:27 -0800
commitd5fba526baf402a44c7e799d92db4d8310e031d0 (patch)
treef67fbdaca37e64288e60747a146781232cdff544
parentc443aac9b851cbec571516731968f69766251759 (diff)
downloadpython-magic-d5fba526baf402a44c7e799d92db4d8310e031d0.tar.gz
Fix dylib look with patch from sacha@ssl.co.uk
-rw-r--r--README1
-rw-r--r--magic.py9
2 files changed, 6 insertions, 4 deletions
diff --git a/README b/README
index 5b438b7..40dce60 100644
--- a/README
+++ b/README
@@ -55,3 +55,4 @@ lukenowak
FlaPer87
SimpleSeb
tehmaze
+sacha@ssl.co.uk
diff --git a/magic.py b/magic.py
index 06ccda0..ff82bd9 100644
--- a/magic.py
+++ b/magic.py
@@ -115,11 +115,12 @@ if dll:
if not libmagic or not libmagic._name:
import sys
- platform_to_lib = {'darwin': 'libmagic.dylib',
- 'win32': 'magic1.dll'}
- if sys.platform in platform_to_lib:
+ platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
+ '/usr/local/lib/libmagic.dylib'],
+ 'win32': ['magic1.dll']}
+ for dll in platform_to_lib.get(sys.platform, []):
try:
- libmagic = ctypes.CDLL(platform_to_lib[sys.platform])
+ libmagic = ctypes.CDLL(dll)
except OSError:
pass