aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/pgp/mime.py
diff options
context:
space:
mode:
authorJ08nY2017-06-25 22:24:53 +0200
committerJ08nY2017-06-25 22:24:53 +0200
commit9646413e0d8b113c463f326f1aa58d5da1cedcd1 (patch)
tree2c10a8c12c60e0eb61675c6dc224ca973a9def59 /src/mailman_pgp/pgp/mime.py
parent468cafd33d41036312b9f4408a7e5a0a45d9ce23 (diff)
downloadmailman-pgp-9646413e0d8b113c463f326f1aa58d5da1cedcd1.tar.gz
mailman-pgp-9646413e0d8b113c463f326f1aa58d5da1cedcd1.tar.zst
mailman-pgp-9646413e0d8b113c463f326f1aa58d5da1cedcd1.zip
Diffstat (limited to 'src/mailman_pgp/pgp/mime.py')
-rw-r--r--src/mailman_pgp/pgp/mime.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mailman_pgp/pgp/mime.py b/src/mailman_pgp/pgp/mime.py
index a373a7c..f3993a9 100644
--- a/src/mailman_pgp/pgp/mime.py
+++ b/src/mailman_pgp/pgp/mime.py
@@ -98,7 +98,8 @@ class MIMEWrapper:
def is_keys(self):
for part in walk(self.msg):
- if part.get_content_type() != MIMEWrapper._keys_type:
+ if (not part.is_multipart()
+ and part.get_content_type() != MIMEWrapper._keys_type):
return False
return True
@@ -110,7 +111,8 @@ class MIMEWrapper:
:rtype: bool
"""
for part in walk(self.msg):
- if part.get_content_type() == MIMEWrapper._keys_type:
+ if (not part.is_multipart()
+ and part.get_content_type() == MIMEWrapper._keys_type):
return True
return False
@@ -121,7 +123,8 @@ class MIMEWrapper:
:return: A collection of keys.
"""
for part in walk(self.msg):
- if part.get_content_type() == MIMEWrapper._keys_type:
+ if (not part.is_multipart()
+ and part.get_content_type() == MIMEWrapper._keys_type):
key, _ = PGPKey.from_blob(part.get_payload())
yield key