Fix exception raised by sending binary content (fixes #1).

pyhectane/connection.py

@@ -3,7 +3,7 @@
 from os.path import basename
 
 from requests import Session
-from six import string_types
+from six import binary_type, string_types
 
 
 class Connection:
@@ -35,18 +35,19 @@ def _process_attachments(self, attachments):
         if the filename cannot be determined, it will be set to "untitled".
         """
         for a in attachments:
-            if isinstance(a, dict):
-                yield a
-            else:
+            if not isinstance(a, dict):
                 if isinstance(a, string_types):
                     a = open(a, 'rb')
                 filename = basename(getattr(a, 'name', 'untitled'))
-                yield {
+                a = {
                     "filename": filename,
                     "content_type": guess_type(filename)[0] or 'application/octet-stream',
-                    "content": b64encode(a.read()).decode(),
-                    "encoded": True,
+                    "content": a.read(),
                 }
+            if isinstance(a['content'], binary_type):
+                a['content'] = b64encode(a['content']).decode()
+                a['encoded'] = True
+            yield a
 
     def raw(self, from_, to, body):
         """

tests.py

@@ -129,12 +129,13 @@ def test_send_empty_content(self):
         with self._r:
             self._c.send(self._FROM, [self._TO], self._SUBJECT)
 
-    def test_send_attachment_dict(self):
+    def test_send_attachment_binary(self):
         with self._r:
             self._c.send(self._FROM, [self._TO], self._SUBJECT, self._SDATA,
-                         attachments=[{}])
+                         attachments=[{'content': self._BDATA}])
         data = loads(self._r.data.decode())
-        eq_(len(data['attachments']), 1)
+        eq_(data['attachments'][0]['encoded'], True)
+        eq_(b64decode(data['attachments'][0]['content']), self._BDATA)
 
     def test_send_attachment_file(self):
         with NamedTemporaryFile() as f: