1.1 --- a/MoinShare.py Tue Aug 27 23:34:44 2013 +0200
1.2 +++ b/MoinShare.py Fri Sep 13 00:29:13 2013 +0200
1.3 @@ -11,7 +11,7 @@
1.4 from ContentTypeSupport import getContentPreferences
1.5 from DateSupport import getCurrentTime, getDateTimeFromRFC2822
1.6 from MoinSupport import *
1.7 -from MoinMessage import GPG, is_encrypted, is_signed
1.8 +from MoinMessage import GPG, is_encrypted, is_signed, MoinMessageError
1.9 from MoinMessageSupport import get_homedir
1.10 from MoinMoin.support.htmlmarkup import HTMLParseError, HTMLSanitizer, Markup
1.11 from MoinMoin import wikiutil
1.12 @@ -266,7 +266,11 @@
1.13 # Encrypted content cannot be meaningfully separated.
1.14
1.15 elif part.get_content_subtype() == "encrypted":
1.16 - return getUpdateContentFromPart(getDecryptedParts(part, request), request)
1.17 + try:
1.18 + part = getDecryptedParts(part, request)
1.19 + return getUpdateContentFromPart(part, request)
1.20 + except MoinMessageError:
1.21 + return None, part.get_content_type(), part.get_payload()
1.22
1.23 # Otherwise, just obtain the parts for separate display.
1.24