diff options
Diffstat (limited to 'src/mailman_pgp/testing')
| -rw-r--r-- | src/mailman_pgp/testing/pgp.py | 21 |
1 files changed, 9 insertions, 12 deletions
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): |