diff options
| -rw-r--r-- | src/mailman_pgp/pgp/tests/test_inline.py | 4 | ||||
| -rw-r--r-- | src/mailman_pgp/pgp/tests/test_mime.py | 4 | ||||
| -rw-r--r-- | src/mailman_pgp/pgp/tests/test_wrapper.py | 4 | ||||
| -rw-r--r-- | src/mailman_pgp/testing/pgp.py | 21 | ||||
| -rw-r--r-- | src/mailman_pgp/utils/email.py | 3 |
5 files changed, 17 insertions, 19 deletions
diff --git a/src/mailman_pgp/pgp/tests/test_inline.py b/src/mailman_pgp/pgp/tests/test_inline.py index 1f1f687..d9f8c8a 100644 --- a/src/mailman_pgp/pgp/tests/test_inline.py +++ b/src/mailman_pgp/pgp/tests/test_inline.py @@ -20,8 +20,8 @@ from parameterized import parameterized from mailman_pgp.pgp.inline import InlineWrapper -from mailman_pgp.testing.pgp import (load_key, load_message, WrapperTestCase, - load_revoc) +from mailman_pgp.testing.pgp import ( + load_key, load_message, load_revoc, WrapperTestCase) class InlineWrapperTestCase(WrapperTestCase): diff --git a/src/mailman_pgp/pgp/tests/test_mime.py b/src/mailman_pgp/pgp/tests/test_mime.py index f059c8d..e9951cf 100644 --- a/src/mailman_pgp/pgp/tests/test_mime.py +++ b/src/mailman_pgp/pgp/tests/test_mime.py @@ -20,8 +20,8 @@ from parameterized import parameterized from mailman_pgp.pgp.mime import MIMEWrapper -from mailman_pgp.testing.pgp import (load_key, load_message, WrapperTestCase, - load_revoc) +from mailman_pgp.testing.pgp import ( + load_key, load_message, load_revoc, WrapperTestCase) class MIMEWrapperTestCase(WrapperTestCase): diff --git a/src/mailman_pgp/pgp/tests/test_wrapper.py b/src/mailman_pgp/pgp/tests/test_wrapper.py index 465b740..b9c157a 100644 --- a/src/mailman_pgp/pgp/tests/test_wrapper.py +++ b/src/mailman_pgp/pgp/tests/test_wrapper.py @@ -22,8 +22,8 @@ from mailman_pgp.pgp.inline import InlineWrapper from mailman_pgp.pgp.mime import MIMEWrapper from mailman_pgp.pgp.mime_multisig import MIMEMultiSigWrapper from mailman_pgp.pgp.wrapper import PGPWrapper -from mailman_pgp.testing.pgp import (load_key, load_message, WrapperTestCase, - load_revoc) +from mailman_pgp.testing.pgp import ( + load_key, load_message, load_revoc, WrapperTestCase) class PGPWrapperTestCase(WrapperTestCase): diff --git a/src/mailman_pgp/testing/pgp.py b/src/mailman_pgp/testing/pgp.py index 90deb7a..15723bc 100644 --- a/src/mailman_pgp/testing/pgp.py +++ b/src/mailman_pgp/testing/pgp.py @@ -19,6 +19,7 @@ import os from email import message_from_bytes +from operator import attrgetter from unittest import TestCase from mailman.email.message import Message @@ -142,9 +143,8 @@ class WrapperTestCase(TestCase): loaded = list(wrapped.keys()) self.assertEqual(len(loaded), len(keys)) - get_fingerprint = lambda key: key.fingerprint - loaded_fingerprints = list(map(get_fingerprint, loaded)) - fingerprints = list(map(get_fingerprint, keys)) + loaded_fingerprints = list(map(attrgetter('fingerprint'), loaded)) + fingerprints = list(map(attrgetter('fingerprint'), keys)) self.assertListEqual(loaded_fingerprints, fingerprints) def attach_keys(self, message, keys): @@ -154,9 +154,8 @@ class WrapperTestCase(TestCase): loaded = list(wrapped.keys()) self.assertTrue(wrapped.has_keys()) - get_fingerprint = lambda key: key.fingerprint - loaded_fingerprints = list(map(get_fingerprint, loaded)) - fingerprints = list(map(get_fingerprint, keys)) + loaded_fingerprints = list(map(attrgetter('fingerprint'), loaded)) + fingerprints = list(map(attrgetter('fingerprint'), keys)) self.assertListEqual(loaded_fingerprints, fingerprints) def has_revocs(self, message, has_revocs): @@ -172,9 +171,8 @@ class WrapperTestCase(TestCase): loaded = list(wrapped.revocs()) self.assertEqual(len(loaded), len(revocs)) - get_issuer = lambda revoc: revoc.signer - loaded_issuers = list(map(get_issuer, loaded)) - issuers = list(map(get_issuer, revocs)) + loaded_issuers = list(map(attrgetter('signer'), loaded)) + issuers = list(map(attrgetter('signer'), revocs)) self.assertListEqual(loaded_issuers, issuers) def attach_revocs(self, message, revocs): @@ -184,9 +182,8 @@ class WrapperTestCase(TestCase): loaded = list(wrapped.revocs()) self.assertTrue(wrapped.has_revocs()) - get_issuer = lambda revoc: revoc.signer - loaded_issuers = list(map(get_issuer, loaded)) - issuers = list(map(get_issuer, revocs)) + loaded_issuers = list(map(attrgetter('signer'), loaded)) + issuers = list(map(attrgetter('signer'), revocs)) self.assertListEqual(loaded_issuers, issuers) def sign_encrypt_decrypt_verify(self, message, sign_key, encrypt_key): diff --git a/src/mailman_pgp/utils/email.py b/src/mailman_pgp/utils/email.py index 9eff313..ac1ab66 100644 --- a/src/mailman_pgp/utils/email.py +++ b/src/mailman_pgp/utils/email.py @@ -70,7 +70,8 @@ def make_multipart(msg): :param msg: :type msg: email.message.Message :return: - :rtype: email.message.MIMEMultipart|mailman.email.message.MultipartDigestMessage + :rtype: email.message.MIMEMultipart| + mailman.email.message.MultipartDigestMessage """ if msg.is_multipart(): out = copy.deepcopy(msg) |