base: Push XMLRPC Binary handling down into Backend

crobinso · crobinso · commit 0ba07f4f9fa0 · 2020-01-08T16:13:39.000-05:00
Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_backendbase.py b/bugzilla/_backendbase.py
@@ -59,10 +59,14 @@ def bug_attachment_get_all(self, bug_ids, paramdict):
         """
         raise NotImplementedError()
 
-    def bug_attachment_create(self, paramdict):
+    def bug_attachment_create(self, data, paramdict):
         """
         Create a bug attachment
         http://bugzilla.readthedocs.io/en/latest/api/core/v1/attachment.html#create-attachment
+
+        :param data: raw Bytes data of the attachment to attach. API will
+            encode this correctly if you pass it in and 'data' is not in
+            paramdict.
         """
         raise NotImplementedError()
 
diff --git a/bugzilla/_backendxmlrpc.py b/bugzilla/_backendxmlrpc.py
@@ -6,9 +6,10 @@
 
 # pylint: disable=import-error
 if sys.version_info[0] >= 3:
-    from xmlrpc.client import Fault, ProtocolError, ServerProxy, Transport
+    from xmlrpc.client import (Binary, Fault, ProtocolError,
+                               ServerProxy, Transport)
 else:
-    from xmlrpclib import Fault, ProtocolError, ServerProxy, Transport
+    from xmlrpclib import Binary, Fault, ProtocolError, ServerProxy, Transport
 # pylint: enable=import-error
 
 from requests import RequestException
@@ -172,7 +173,9 @@ def bug_attachment_get_all(self, bug_ids, paramdict):
         data = paramdict.copy()
         data["ids"] = listify(bug_ids)
         return self._xmlrpc_proxy.Bug.attachments(data)
-    def bug_attachment_create(self, paramdict):
+    def bug_attachment_create(self, data, paramdict):
+        if data is not None and "data" not in paramdict:
+            paramdict["data"] = Binary(data)
         return self._xmlrpc_proxy.Bug.add_attachment(paramdict)
     def bug_attachment_update(self, paramdict):
         return self._xmlrpc_proxy.Bug.update_attachment(paramdict)
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -19,11 +19,9 @@
 if sys.version_info[0] >= 3:
     from collections.abc import Mapping
     from urllib.parse import urlparse, urlunparse, parse_qsl
-    from xmlrpc.client import Binary
 else:
     from collections import Mapping
     from urlparse import urlparse, urlunparse, parse_qsl
-    from xmlrpclib import Binary
 # pylint: enable=import-error,no-name-in-module,ungrouped-imports
 
 
@@ -1523,7 +1521,6 @@ def attachfile(self, idlist, attachfile, description, **kwargs):
         data = f.read()
         if not isinstance(data, bytes):
             data = data.encode(locale.getpreferredencoding())
-        kwargs['data'] = Binary(data)
 
         kwargs['ids'] = listify(idlist)
 
@@ -1536,7 +1533,7 @@ def attachfile(self, idlist, attachfile, description, **kwargs):
                     kwargs['file_name'], strict=False)[0]
             kwargs['content_type'] = ctype or 'application/octet-stream'
 
-        ret = self._backend.bug_attachment_create(kwargs)
+        ret = self._backend.bug_attachment_create(data, kwargs)
 
         if "attachments" in ret:
             # Up to BZ 4.2
