Merge pull request #68 from EugeneSusla/master

Fixed 'ImportError: failed to find libmagic.  Check your installation' when using cygwin's python

1 files changed, 3 insertions, 1 deletions

diff --git a/magic.py b/magic.py
index 57e186f..9e5c6de 100644
--- a/magic.py
+++ b/magic.py
@@ -159,11 +159,13 @@ if dll:
     libmagic = ctypes.CDLL(dll)
 
 if not libmagic or not libmagic._name:
+    windows_dlls = ['magic1.dll','cygmagic-1.dll']
     platform_to_lib = {'darwin': ['/opt/local/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','cygmagic-1.dll']}
+                       'win32': windows_dlls,
+                       'cygwin': windows_dlls }
     for dll in platform_to_lib.get(sys.platform, []):
         try:
             libmagic = ctypes.CDLL(dll)