Replace windows docs with cygwin instructions/path

README.md

@@ -34,12 +34,9 @@ Other sources:
 
 ### Dependencies
 
-On Windows, you need to download and save the following libraries under
-`C:\Windows\System32`:
-
--   `regex2.dll` from [sourceforge.net/projects/gnuwin32/files/regex/](http://sourceforge.net/projects/gnuwin32/files/regex/)
--   `zlib1.dll` from [sourceforge.net/projects/gnuwin32/files/zlib/](http://sourceforge.net/projects/gnuwin32/files/zlib/)
--   `magic1.dll` from [sourceforge.net/projects/gnuwin32/files/file/](http://sourceforge.net/projects/gnuwin32/files/file/)
+On Windows, install Cygwin (http://cygwin.com/install.html).  To find
+the libraries, either add <your-cygwin-install>/bin to the $PATH or
+copy cygwin1.dll, cygz.dll, and cygmagic-1.dll to C:\Windows\System32
 
 On OSX:
 

magic.py

@@ -158,9 +158,9 @@ def from_buffer(buffer, mime=False):
     import sys
     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']}
+                         # Assumes there will only be one version installed
+                         glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'),
+                       'win32':  ['magic1.dll','cygmagic-1.dll']}
     for dll in platform_to_lib.get(sys.platform, []):
         try:
             libmagic = ctypes.CDLL(dll)