# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1379024953 -7200
# Node ID 479b8d23d2ea4094f438c0ae54d7b30a15bfbd45
# Parent  68bbf53c6ba089dd47559dfbfb9ed4fd9fc0efe5
Handle unencryptable messages gracefully.

diff -r 68bbf53c6ba0 -r 479b8d23d2ea MoinShare.py
--- a/MoinShare.py	Tue Aug 27 23:34:44 2013 +0200
+++ b/MoinShare.py	Fri Sep 13 00:29:13 2013 +0200
@@ -11,7 +11,7 @@
 from ContentTypeSupport import getContentPreferences
 from DateSupport import getCurrentTime, getDateTimeFromRFC2822
 from MoinSupport import *
-from MoinMessage import GPG, is_encrypted, is_signed
+from MoinMessage import GPG, is_encrypted, is_signed, MoinMessageError
 from MoinMessageSupport import get_homedir
 from MoinMoin.support.htmlmarkup import HTMLParseError, HTMLSanitizer, Markup
 from MoinMoin import wikiutil
@@ -266,7 +266,11 @@
     # Encrypted content cannot be meaningfully separated.
 
     elif part.get_content_subtype() == "encrypted":
-        return getUpdateContentFromPart(getDecryptedParts(part, request), request)
+        try:
+            part = getDecryptedParts(part, request)
+            return getUpdateContentFromPart(part, request)
+        except MoinMessageError:
+            return None, part.get_content_type(), part.get_payload()
 
     # Otherwise, just obtain the parts for separate display.