1.1 --- a/MoinMessageSupport.py Wed Oct 16 18:18:33 2013 +0200
1.2 +++ b/MoinMessageSupport.py Wed Nov 06 14:44:50 2013 +0100
1.3 @@ -10,8 +10,8 @@
1.4 from MoinMoin.log import getLogger
1.5 from MoinMoin.user import User
1.6 from MoinMoin import wikiutil
1.7 -from MoinSupport import ItemStore, getHeader, getMetadata, getWikiDict, \
1.8 - writeHeaders
1.9 +from MoinSupport import getHeader, getMetadata, getWikiDict, writeHeaders
1.10 +from ItemSupport import ItemStore
1.11 from MoinMessage import GPG, Message, MoinMessageError, \
1.12 MoinMessageMissingPart, MoinMessageBadContent, \
1.13 is_signed, is_encrypted, getContentAndSignature
2.1 --- a/actions/ReadMessage.py Wed Oct 16 18:18:33 2013 +0200
2.2 +++ b/actions/ReadMessage.py Wed Nov 06 14:44:50 2013 +0100
2.3 @@ -8,6 +8,7 @@
2.4
2.5 from MoinMoin.action import ActionBase
2.6 from MoinSupport import *
2.7 +from ItemSupport import ItemStore
2.8 from email.parser import Parser
2.9
2.10 try:
3.1 --- a/actions/SendMessage.py Wed Oct 16 18:18:33 2013 +0200
3.2 +++ b/actions/SendMessage.py Wed Nov 06 14:44:50 2013 +0100
3.3 @@ -14,6 +14,7 @@
3.4 from MoinMessage import GPG, MoinMessageError, Message, sendMessage, timestamp
3.5 from MoinMessageSupport import get_signing_users, get_recipients, get_relays
3.6 from MoinSupport import *
3.7 +from ItemSupport import ItemStore
3.8 from MoinMoin.wikiutil import escape, MimeType, parseQueryString, \
3.9 taintfilename
3.10