Travis Shirk avatar Travis Shirk committed ae471fe

Prefer the magic module if it's there for mime type detection.

Comments (0)

Files changed (1)


     magic_func = None
 def guessMimetype(filename):
-    mime, enc = _mime_types.guess_type(filename, strict=False)
-    if not mime and magic_func:
+    '''Return the mime-type for ``filename``. If available ``python-magic``
+    is used to provide better type detection.'''
+    mime = None
+    if magic_func:
         mime = magic_func(filename)
         if mime:
             mime = mime.split(";")[0]
+    if not mime:
+        mime, enc = _mime_types.guess_type(filename, strict=False)
     return mime
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.