Merge branch 'mime-guessing'

Conflicts: S3/S3.py
mdomsch · Jun 27, 2012 · 9447184 · 9447184
2 parents 9847f33 + 53c7df8
commit 9447184
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/S3/S3.py b/S3/S3.py
@@ -52,7 +52,7 @@ def mime_magic(file):
             return (type, None)
         else:
             return (mime_magic_buffer(gzip.open(file).read(8192)), 'gzip')
-            
+
 except ImportError, e:
     if str(e).find("magic") >= 0:
         magic_message = "Module python-magic is not available."