diff options
| author | J08nY | 2017-08-23 20:12:10 +0200 |
|---|---|---|
| committer | J08nY | 2017-08-23 20:12:10 +0200 |
| commit | a0997fb8e5893fed2c2275ff0cfbfa892b261601 (patch) | |
| tree | 926f093cbe087a8c7f69705f159fe85ff8799caa /src/mailman_pgp/archivers | |
| parent | 43cc9d3e2c76c82bd00ce46ee7de6d69d07f3bb3 (diff) | |
| download | mailman-pgp-feature/wrappers-modify.tar.gz mailman-pgp-feature/wrappers-modify.tar.zst mailman-pgp-feature/wrappers-modify.zip | |
Diffstat (limited to 'src/mailman_pgp/archivers')
| -rw-r--r-- | src/mailman_pgp/archivers/local_maildir.py | 5 | ||||
| -rw-r--r-- | src/mailman_pgp/archivers/local_mbox.py | 5 | ||||
| -rw-r--r-- | src/mailman_pgp/archivers/tests/test_maildir.py | 2 | ||||
| -rw-r--r-- | src/mailman_pgp/archivers/tests/test_mbox.py | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/mailman_pgp/archivers/local_maildir.py b/src/mailman_pgp/archivers/local_maildir.py index 4b7e75d..a99966c 100644 --- a/src/mailman_pgp/archivers/local_maildir.py +++ b/src/mailman_pgp/archivers/local_maildir.py @@ -65,8 +65,7 @@ class LocalMaildirArchiver: '{}-{}.lock'.format(mlist.fqdn_listname, LocalMaildirArchiver.name) ) - wrapped = MIMEWrapper(msg) - encrypted = wrapped.encrypt(pgp_list.pubkey) + MIMEWrapper(msg).encrypt(pgp_list.pubkey) with Lock(lock_file): - maildir.add(encrypted) + maildir.add(msg) return None diff --git a/src/mailman_pgp/archivers/local_mbox.py b/src/mailman_pgp/archivers/local_mbox.py index 99264c2..e8abdcf 100644 --- a/src/mailman_pgp/archivers/local_mbox.py +++ b/src/mailman_pgp/archivers/local_mbox.py @@ -65,8 +65,7 @@ class LocalMailboxArchiver: '{}-{}.lock'.format(mlist.fqdn_listname, LocalMailboxArchiver.name) ) - wrapped = MIMEWrapper(msg) - encrypted = wrapped.encrypt(pgp_list.pubkey) + MIMEWrapper(msg).encrypt(pgp_list.pubkey) with Lock(lock_file): - mailbox.add(encrypted) + mailbox.add(msg) return None diff --git a/src/mailman_pgp/archivers/tests/test_maildir.py b/src/mailman_pgp/archivers/tests/test_maildir.py index 876b2c9..b12d383 100644 --- a/src/mailman_pgp/archivers/tests/test_maildir.py +++ b/src/mailman_pgp/archivers/tests/test_maildir.py @@ -82,5 +82,5 @@ but the water deserves to be swum. message = messages[0] wrapped = MIMEWrapper(message) self.assertTrue(wrapped.is_encrypted()) - decrypted = wrapped.decrypt(self.list_key) + decrypted = wrapped.decrypt(self.list_key).msg self.assertTrue(self.msg.as_string(), decrypted.as_string()) diff --git a/src/mailman_pgp/archivers/tests/test_mbox.py b/src/mailman_pgp/archivers/tests/test_mbox.py index 8af2b77..f660344 100644 --- a/src/mailman_pgp/archivers/tests/test_mbox.py +++ b/src/mailman_pgp/archivers/tests/test_mbox.py @@ -82,5 +82,5 @@ but the water deserves to be swum. message = messages[0] wrapped = MIMEWrapper(message) self.assertTrue(wrapped.is_encrypted()) - decrypted = wrapped.decrypt(self.list_key) + decrypted = wrapped.decrypt(self.list_key).msg self.assertTrue(self.msg.as_string(), decrypted.as_string()) |