# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1389134835 -3600
# Node ID a046e82a4f573582e5e269f4f01fd98995c8996f
# Parent  33492399902b9a1cc2f834f963a9c842db5fdc94
Replaced StringIO usage with Parser.parsestr usage.

diff -r 33492399902b -r a046e82a4f57 MoinMoin/auth/pgp.py
--- a/MoinMoin/auth/pgp.py	Tue Jan 07 23:46:19 2014 +0100
+++ b/MoinMoin/auth/pgp.py	Tue Jan 07 23:47:15 2014 +0100
@@ -5,7 +5,7 @@
     @copyright: 2001-2003 Juergen Hermann <jh@web.de>
                 2003-2006 MoinMoin:ThomasWaldmann
                 2007 MoinMoin:JohannesBerg
-                2013 Paul Boddie <paul@boddie.org.uk>
+                2013, 2014 Paul Boddie <paul@boddie.org.uk>
     @license: GNU GPL, see COPYING for details.
 """
 
@@ -78,7 +78,7 @@
 
         # Obtain a message from the text.
 
-        message = Parser().parse(StringIO(message_text))
+        message = Parser().parsestr(message_text)
 
         try:
             homedir = get_homedir(request)
@@ -89,7 +89,7 @@
 
                 if is_encrypted(message):
                     message_text = gpg.decryptMessage(message)
-                    message = Parser().parse(StringIO(message_text))
+                    message = Parser().parsestr(message_text)
 
                 # Signed messages can be handled directly.
 
diff -r 33492399902b -r a046e82a4f57 actions/FetchMessages.py
--- a/actions/FetchMessages.py	Tue Jan 07 23:46:19 2014 +0100
+++ b/actions/FetchMessages.py	Tue Jan 07 23:47:15 2014 +0100
@@ -15,11 +15,6 @@
 from email.parser import Parser
 from itertools import islice
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
 Dependencies = ['pages']
 
 class FetchMessages(MoinMessageAction):
@@ -124,7 +119,7 @@
                         container = Message()
 
                         for message_text in islice(iter(self.store), count):
-                            message_item = Parser().parse(StringIO(message_text))
+                            message_item = Parser().parsestr(message_text)
                             container.add_update(message_item)
 
                         # Convert the container to a proper multipart section.
diff -r 33492399902b -r a046e82a4f57 actions/ReadMessage.py
--- a/actions/ReadMessage.py	Tue Jan 07 23:46:19 2014 +0100
+++ b/actions/ReadMessage.py	Tue Jan 07 23:47:15 2014 +0100
@@ -11,11 +11,6 @@
 from ItemSupport import ItemStore
 from email.parser import Parser
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
 Dependencies = []
 
 class ReadMessage(ActionBase, ActionSupport):
@@ -105,7 +100,7 @@
 
         # Visit the message parts, looking for the indicated component.
 
-        message = Parser().parse(StringIO(message_text))
+        message = Parser().parsestr(message_text)
 
         if message.is_multipart():
             for part in message.get_payload():
diff -r 33492399902b -r a046e82a4f57 tests/test_fetch.py
--- a/tests/test_fetch.py	Tue Jan 07 23:46:19 2014 +0100
+++ b/tests/test_fetch.py	Tue Jan 07 23:47:15 2014 +0100
@@ -5,18 +5,13 @@
 from email.parser import Parser
 import sys
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
 def decrypt(message):
 
     "Decrypt 'message' if necessary."
 
     if is_encrypted(message):
         text = gpg.decryptMessage(message)
-        return Parser().parse(StringIO(text))
+        return Parser().parsestr(text)
     else:
         return message
 
@@ -55,7 +50,7 @@
         signed_message = gpg.signMessage(email_message, signer)
         encrypted_message = gpg.encryptMessage(signed_message, recipient)
         text = sendMessage(encrypted_message, url, "PUT")
-        mailbox = Parser().parse(StringIO(text))
+        mailbox = Parser().parsestr(text)
 
         mailbox = decrypt(mailbox)
         fingerprint, identity, content = verify(mailbox)