# HG changeset patch # User Paul Boddie # Date 1383745490 -3600 # Node ID 039b4e617b8e04152d03c6b7c32eae88be8c8bf8 # Parent 89f08564466aa18a950e69ea245973463fec6257 Obtain ItemStore from ItemSupport. diff -r 89f08564466a -r 039b4e617b8e MoinMessageSupport.py --- a/MoinMessageSupport.py Wed Oct 16 18:18:33 2013 +0200 +++ b/MoinMessageSupport.py Wed Nov 06 14:44:50 2013 +0100 @@ -10,8 +10,8 @@ from MoinMoin.log import getLogger from MoinMoin.user import User from MoinMoin import wikiutil -from MoinSupport import ItemStore, getHeader, getMetadata, getWikiDict, \ - writeHeaders +from MoinSupport import getHeader, getMetadata, getWikiDict, writeHeaders +from ItemSupport import ItemStore from MoinMessage import GPG, Message, MoinMessageError, \ MoinMessageMissingPart, MoinMessageBadContent, \ is_signed, is_encrypted, getContentAndSignature diff -r 89f08564466a -r 039b4e617b8e actions/ReadMessage.py --- a/actions/ReadMessage.py Wed Oct 16 18:18:33 2013 +0200 +++ b/actions/ReadMessage.py Wed Nov 06 14:44:50 2013 +0100 @@ -8,6 +8,7 @@ from MoinMoin.action import ActionBase from MoinSupport import * +from ItemSupport import ItemStore from email.parser import Parser try: diff -r 89f08564466a -r 039b4e617b8e actions/SendMessage.py --- a/actions/SendMessage.py Wed Oct 16 18:18:33 2013 +0200 +++ b/actions/SendMessage.py Wed Nov 06 14:44:50 2013 +0100 @@ -14,6 +14,7 @@ from MoinMessage import GPG, MoinMessageError, Message, sendMessage, timestamp from MoinMessageSupport import get_signing_users, get_recipients, get_relays from MoinSupport import * +from ItemSupport import ItemStore from MoinMoin.wikiutil import escape, MimeType, parseQueryString, \ taintfilename