summaryrefslogtreecommitdiff
path: root/src/mailman/archiving/mailarchive.py
diff options
context:
space:
mode:
authorBarry Warsaw2012-08-18 19:32:53 -0400
committerBarry Warsaw2012-08-18 19:32:53 -0400
commitb301eeb71249ef58ffcc8b285d51b19c8b42812b (patch)
tree56552098758969669957f6ba0a175bc2cdbea19d /src/mailman/archiving/mailarchive.py
parentffd6b7b2ec632920cbf9d413aa20d83d8333c87f (diff)
downloadmailman-b301eeb71249ef58ffcc8b285d51b19c8b42812b.tar.gz
mailman-b301eeb71249ef58ffcc8b285d51b19c8b42812b.tar.zst
mailman-b301eeb71249ef58ffcc8b285d51b19c8b42812b.zip
Diffstat (limited to 'src/mailman/archiving/mailarchive.py')
-rw-r--r--src/mailman/archiving/mailarchive.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mailman/archiving/mailarchive.py b/src/mailman/archiving/mailarchive.py
index 69ca77e52..e61683a09 100644
--- a/src/mailman/archiving/mailarchive.py
+++ b/src/mailman/archiving/mailarchive.py
@@ -30,7 +30,7 @@ from urlparse import urljoin
from zope.interface import implementer
from mailman.config import config
-from mailman.interfaces.archiver import IArchiver
+from mailman.interfaces.archiver import ArchivePolicy, IArchiver
@@ -46,15 +46,15 @@ class MailArchive:
@staticmethod
def list_url(mlist):
"""See `IArchiver`."""
- if mlist.archive_private:
- return None
- return urljoin(config.archiver.mail_archive.base_url,
- quote(mlist.posting_address))
+ if mlist.archive_policy is ArchivePolicy.public:
+ return urljoin(config.archiver.mail_archive.base_url,
+ quote(mlist.posting_address))
+ return None
@staticmethod
def permalink(mlist, msg):
"""See `IArchiver`."""
- if mlist.archive_private:
+ if mlist.archive_policy is not ArchivePolicy.public:
return None
# It is the LMTP server's responsibility to ensure that the message
# has a X-Message-ID-Hash header. If it doesn't then there's no
@@ -67,7 +67,7 @@ class MailArchive:
@staticmethod
def archive_message(mlist, msg):
"""See `IArchiver`."""
- if not mlist.archive_private:
+ if mlist.archive_policy is ArchivePolicy.public:
config.switchboards['out'].enqueue(
msg,
listname=mlist.fqdn_listname,