base: Reimplement openattachment to use get_attachments

crobinso · crobinso · commit ea23c04140a2 · 2018-03-04T13:24:06.000-05:00
This impl predates any attachment APIs, so it grabs attachment
from a URL. This is broken with current bugzilla.redhat.com though,
and since it requires silly tricks anyways, just convert to using
standard APIs
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -1531,34 +1531,13 @@ def attachfile(self, idlist, attachfile, description, **kwargs):
     def openattachment(self, attachid):
         '''Get the contents of the attachment with the given attachment ID.
         Returns a file-like object.'''
-
-        def get_filename(headers):
-            import re
-
-            match = re.search(
-                r'^.*filename="?(.*)"$',
-                headers.get('content-disposition', '')
-            )
-
-            # default to attchid if no match was found
-            return match.group(1) if match else attachid
-
-        att_uri = self._attachment_uri(attachid)
-
-        defaults = self._transport.request_defaults.copy()
-        defaults["headers"] = defaults["headers"].copy()
-        del(defaults["headers"]["Content-Type"])
-
-        response = self._transport.session.get(
-            att_uri, stream=True, **defaults)
+        attachments = self.get_attachments(None, attachid)
+        data = attachments["attachments"][str(attachid)]
+        xmlrpcbinary = data["data"]
 
         ret = BytesIO()
-        for chunk in response.iter_content(chunk_size=1024):
-            if chunk:
-                ret.write(chunk)
-        ret.name = get_filename(response.headers)
-
-        # Hooray, now we have a file-like object with .read() and .name
+        ret.write(xmlrpcbinary.data)
+        ret.name = data["file_name"]
         ret.seek(0)
         return ret
 
