aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/pgp/mime.py
diff options
context:
space:
mode:
authorJ08nY2017-06-29 18:09:42 +0200
committerJ08nY2017-06-29 18:09:42 +0200
commitafd6dede602510f576e8f52ec50d67b2f3894f84 (patch)
tree686a1d48bb8e798c969bc0626b022c08e77e7b30 /src/mailman_pgp/pgp/mime.py
parent53163c823de985beb416ba0d4c7d31148984dcff (diff)
downloadmailman-pgp-afd6dede602510f576e8f52ec50d67b2f3894f84.tar.gz
mailman-pgp-afd6dede602510f576e8f52ec50d67b2f3894f84.tar.zst
mailman-pgp-afd6dede602510f576e8f52ec50d67b2f3894f84.zip
Add test data for mime encrypted messages.
Diffstat (limited to 'src/mailman_pgp/pgp/mime.py')
-rw-r--r--src/mailman_pgp/pgp/mime.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mailman_pgp/pgp/mime.py b/src/mailman_pgp/pgp/mime.py
index 31dcdf3..ecddbb0 100644
--- a/src/mailman_pgp/pgp/mime.py
+++ b/src/mailman_pgp/pgp/mime.py
@@ -205,7 +205,12 @@ class MIMEWrapper:
pmsg = PGPMessage()
pmsg.parse(msg_text)
decrypted = key.decrypt(pmsg)
- out = message_from_string(decrypted.message, _class=Message)
+
+ dmsg = decrypted.message
+ if isinstance(dmsg, bytearray):
+ dmsg = dmsg.decode('utf-8')
+
+ out = message_from_string(dmsg, _class=Message)
copy_headers(self.msg, out)
return out