Permalink
Browse files

Merge branch 'mime-guessing'

Conflicts:
	S3/S3.py
  • Loading branch information...
ksperling committed Jun 27, 2012
2 parents 9847f33 + 53c7df8 commit 9447184f6b944e17379bbffbeefa2f669d081e7b
Showing with 1 addition and 1 deletion.
  1. +1 −1 S3/S3.py
View
@@ -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."

0 comments on commit 9447184

Please sign in to comment.