Encapsulate recipient lists

Implement RecipientList class with:
- recipient (email) list,
- key (identity) list.

Cover with basic unit test.

lacre/core.py

@@ -79,6 +79,9 @@ def _gpg_encrypt(raw_message, recipients):
 
 
 def _sort_gpg_recipients(gpg_to):
+    mime = RecipientList()
+    inline = RecipientList()
+
     recipients_mime = list()
     keys_mime = list()
 
@@ -92,9 +95,11 @@ def _sort_gpg_recipients(gpg_to):
         if conf.config_item_equals('pgp_style', rcpt.email(), 'mime'):
             recipients_mime.append(rcpt.email())
             keys_mime.extend(rcpt.key().split(','))
+            mime += rcpt
         elif conf.config_item_equals('pgp_style', rcpt.email(), 'inline'):
             recipients_inline.append(rcpt.email())
             keys_inline.extend(rcpt.key().split(','))
+            inline += rcpt
         else:
             # Log message only if an unknown style is defined
             if conf.config_item_set('pgp_style', rcpt.email()):
@@ -105,9 +110,14 @@ def _sort_gpg_recipients(gpg_to):
             if default_to_pgp_mime:
                 recipients_mime.append(rcpt.email())
                 keys_mime.extend(rcpt.key().split(','))
+                mime += rcpt
             else:
                 recipients_inline.append(rcpt.email())
                 keys_inline.extend(rcpt.key().split(','))
+                inline += rcpt
+
+    # mime = RecipientList(recipients_mime, keys_mime)
+    # inline = RecipientList(recipients_inline, keys_inline)
 
     return recipients_mime, keys_mime, recipients_inline, keys_inline
 
@@ -181,6 +191,32 @@ class GpgRecipient:
         return self._right
 
 
+class RecipientList:
+    """Encalsulates two lists of recipients.
+
+    First list contains addresses, the second - GPG identities.
+    """
+
+    def __init__(self, recipients=[], keys=[]):
+        """Initialise lists of recipients and identities."""
+        self._recipients = recipients
+
+    def emails(self):
+        """Return list of recipients."""
+        for r in self._recipients:
+            yield r.email()
+
+    def keys(self):
+        """Return list of GPG identities."""
+        for r in self._recipients:
+            yield r.key()
+
+    def __iadd__(self, recipient: GpgRecipient):
+        """Append a recipient."""
+        self._recipients.append(recipient)
+        return self
+
+
 def _identify_gpg_recipients(recipients, keys: kcache.KeyCache):
     # This list will be filled with pairs (M, N), where M is the destination
     # address we're going to deliver the message to and N is the identity we're
@@ -297,7 +333,7 @@ def _encrypt_all_payloads_inline(message: EmailMessage, gpg_to_cmdline):
 def _encrypt_all_payloads_mime(message: EmailMessage, gpg_to_cmdline):
     # Convert a plain text email into PGP/MIME attachment style.  Modeled after enigmail.
     pgp_ver_part = MIMEPart()
-    pgp_ver_part.set_payload('Version: 1' + text.EOL_S)
+    pgp_ver_part.set_content('Version: 1' + text.EOL_S)
     pgp_ver_part.set_type("application/pgp-encrypted")
     pgp_ver_part.set_param('PGP/MIME version identification', "", 'Content-Description')
 

test/modules/test_lacre_core.py

@@ -38,3 +38,17 @@ class LacreCoreTest(unittest.TestCase):
 
         self.assertFalse('Subject' in rewrapped)
         self.assertEqual(rewrapped.get_content_type(), m.get_content_type())
+
+
+class RecipientListTest(unittest.TestCase):
+    def test_addition(self):
+        a_list = lacre.core.RecipientList()
+        a_list += lacre.core.GpgRecipient(
+            'alice@disposlab',
+            '1CD245308F0963D038E88357973CF4D9387C44D7')
+
+        emails = [x for x in a_list.emails()]
+        keys = [x for x in a_list.keys()]
+
+        self.assertSequenceEqual(emails, ['alice@disposlab'])
+        self.assertSequenceEqual(keys, ['1CD245308F0963D038E88357973CF4D9387C44D7'])