1.1 --- a/MoinMoin/auth/pgp.py Tue Jan 07 23:46:19 2014 +0100
1.2 +++ b/MoinMoin/auth/pgp.py Tue Jan 07 23:47:15 2014 +0100
1.3 @@ -5,7 +5,7 @@
1.4 @copyright: 2001-2003 Juergen Hermann <jh@web.de>
1.5 2003-2006 MoinMoin:ThomasWaldmann
1.6 2007 MoinMoin:JohannesBerg
1.7 - 2013 Paul Boddie <paul@boddie.org.uk>
1.8 + 2013, 2014 Paul Boddie <paul@boddie.org.uk>
1.9 @license: GNU GPL, see COPYING for details.
1.10 """
1.11
1.12 @@ -78,7 +78,7 @@
1.13
1.14 # Obtain a message from the text.
1.15
1.16 - message = Parser().parse(StringIO(message_text))
1.17 + message = Parser().parsestr(message_text)
1.18
1.19 try:
1.20 homedir = get_homedir(request)
1.21 @@ -89,7 +89,7 @@
1.22
1.23 if is_encrypted(message):
1.24 message_text = gpg.decryptMessage(message)
1.25 - message = Parser().parse(StringIO(message_text))
1.26 + message = Parser().parsestr(message_text)
1.27
1.28 # Signed messages can be handled directly.
1.29
2.1 --- a/actions/FetchMessages.py Tue Jan 07 23:46:19 2014 +0100
2.2 +++ b/actions/FetchMessages.py Tue Jan 07 23:47:15 2014 +0100
2.3 @@ -15,11 +15,6 @@
2.4 from email.parser import Parser
2.5 from itertools import islice
2.6
2.7 -try:
2.8 - from cStringIO import StringIO
2.9 -except ImportError:
2.10 - from StringIO import StringIO
2.11 -
2.12 Dependencies = ['pages']
2.13
2.14 class FetchMessages(MoinMessageAction):
2.15 @@ -124,7 +119,7 @@
2.16 container = Message()
2.17
2.18 for message_text in islice(iter(self.store), count):
2.19 - message_item = Parser().parse(StringIO(message_text))
2.20 + message_item = Parser().parsestr(message_text)
2.21 container.add_update(message_item)
2.22
2.23 # Convert the container to a proper multipart section.
3.1 --- a/actions/ReadMessage.py Tue Jan 07 23:46:19 2014 +0100
3.2 +++ b/actions/ReadMessage.py Tue Jan 07 23:47:15 2014 +0100
3.3 @@ -11,11 +11,6 @@
3.4 from ItemSupport import ItemStore
3.5 from email.parser import Parser
3.6
3.7 -try:
3.8 - from cStringIO import StringIO
3.9 -except ImportError:
3.10 - from StringIO import StringIO
3.11 -
3.12 Dependencies = []
3.13
3.14 class ReadMessage(ActionBase, ActionSupport):
3.15 @@ -105,7 +100,7 @@
3.16
3.17 # Visit the message parts, looking for the indicated component.
3.18
3.19 - message = Parser().parse(StringIO(message_text))
3.20 + message = Parser().parsestr(message_text)
3.21
3.22 if message.is_multipart():
3.23 for part in message.get_payload():
4.1 --- a/tests/test_fetch.py Tue Jan 07 23:46:19 2014 +0100
4.2 +++ b/tests/test_fetch.py Tue Jan 07 23:47:15 2014 +0100
4.3 @@ -5,18 +5,13 @@
4.4 from email.parser import Parser
4.5 import sys
4.6
4.7 -try:
4.8 - from cStringIO import StringIO
4.9 -except ImportError:
4.10 - from StringIO import StringIO
4.11 -
4.12 def decrypt(message):
4.13
4.14 "Decrypt 'message' if necessary."
4.15
4.16 if is_encrypted(message):
4.17 text = gpg.decryptMessage(message)
4.18 - return Parser().parse(StringIO(text))
4.19 + return Parser().parsestr(text)
4.20 else:
4.21 return message
4.22
4.23 @@ -55,7 +50,7 @@
4.24 signed_message = gpg.signMessage(email_message, signer)
4.25 encrypted_message = gpg.encryptMessage(signed_message, recipient)
4.26 text = sendMessage(encrypted_message, url, "PUT")
4.27 - mailbox = Parser().parse(StringIO(text))
4.28 + mailbox = Parser().parsestr(text)
4.29
4.30 mailbox = decrypt(mailbox)
4.31 fingerprint, identity, content = verify(mailbox)