base: Drop python-magic usage, just check file extension

crobinso · crobinso · commit 5dcfeb60d85e · 2018-08-13T13:51:26.000-04:00
python-magic is overkill, bugzilla attachment autodetect doesn't
even inspect files and just checks file extensions. Simplify by
switching to that method.

Plus it's a bit of a pain to manage the conditional dependency
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -13,6 +13,7 @@
 import getpass
 import locale
 from logging import getLogger
+import mimetypes
 import os
 import sys
 
@@ -40,33 +41,6 @@
 
 log = getLogger(__name__)
 
-mimemagic = None
-
-
-def _detect_filetype(fname):
-    global mimemagic
-
-    if mimemagic is None:
-        try:
-            # pylint: disable=import-error
-            import magic
-            mimemagic = magic.open(getattr(magic, "MAGIC_MIME_TYPE", 16))
-            mimemagic.load()
-        except ImportError as e:
-            log.debug("Could not load python-magic: %s", e)
-            mimemagic = None
-    if not mimemagic:
-        return None
-
-    if not os.path.isabs(fname):
-        return None
-
-    try:
-        return mimemagic.file(fname)
-    except Exception as e:
-        log.debug("Could not detect content_type: %s", e)
-    return None
-
 
 def _nested_update(d, u):
     # Helper for nested dict update()
@@ -1556,10 +1530,11 @@ def attachfile(self, idlist, attachfile, description, **kwargs):
         if 'file_name' not in kwargs and hasattr(f, "name"):
             kwargs['file_name'] = os.path.basename(f.name)
         if 'content_type' not in kwargs:
-            ctype = _detect_filetype(getattr(f, "name", None))
-            if not ctype:
-                ctype = 'application/octet-stream'
-            kwargs['content_type'] = ctype
+            ctype = None
+            if kwargs['file_name']:
+                ctype = mimetypes.guess_type(
+                    kwargs['file_name'], strict=False)[0]
+            kwargs['content_type'] = ctype or 'application/octet-stream'
 
         ret = self._proxy.Bug.add_attachment(kwargs)
 
diff --git a/python-bugzilla.spec b/python-bugzilla.spec
@@ -49,7 +49,6 @@ over XML-RPC.\
 %package -n python2-bugzilla
 Summary: %summary
 Requires: python2-requests
-Requires: python2-magic
 # This dep is for back compat, so that installing python-bugzilla continues
 # to give the cli tool
 Requires: python-bugzilla-cli
@@ -64,7 +63,6 @@ Requires: python-bugzilla-cli
 %package -n python3-bugzilla
 Summary: %summary
 Requires: python3-requests
-Requires: python3-magic
 %{?python_provide:%python_provide python3-bugzilla}
 
 %if %{without python2}
diff --git a/tests/test_rw_functional.py b/tests/test_rw_functional.py
@@ -530,12 +530,12 @@ def _test8Attachments(self):
         attachid = att1["id"]
         assert att1["summary"] == desc1
         assert att1["id"] == int(out1.splitlines()[2].split()[2])
-        assert att1["content_type"] == "application/octet-stream"
+        assert att1["content_type"] == "text/plain"
 
         att2 = setbug.attachments[-1]
         assert att2["summary"] == desc2
         assert att2["id"] == int(out2.splitlines()[2].split()[2])
-        assert att2["content_type"] == "text/x-diff"
+        assert att2["content_type"] == "application/octet-stream"
 
         # Set attachment flags
         assert att1["flags"] == []
