summaryrefslogtreecommitdiff
path: root/src/mailman/archiving/prototype.py
diff options
context:
space:
mode:
authorAurélien Bompard2015-06-30 11:42:48 +0200
committerAurélien Bompard2015-06-30 17:56:07 +0200
commite6ec3242c2cb1a19ad1df0acd448cd3d0e0e80bf (patch)
treef7258dacaadc52773bb71cbfcb54e7565c4d74a5 /src/mailman/archiving/prototype.py
parent0c29acbe1ca26e7e13150186b78fb7cc1bef411c (diff)
downloadmailman-e6ec3242c2cb1a19ad1df0acd448cd3d0e0e80bf.tar.gz
mailman-e6ec3242c2cb1a19ad1df0acd448cd3d0e0e80bf.tar.zst
mailman-e6ec3242c2cb1a19ad1df0acd448cd3d0e0e80bf.zip
Diffstat (limited to 'src/mailman/archiving/prototype.py')
-rw-r--r--src/mailman/archiving/prototype.py19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/mailman/archiving/prototype.py b/src/mailman/archiving/prototype.py
index 73c296b5d..c17d6b504 100644
--- a/src/mailman/archiving/prototype.py
+++ b/src/mailman/archiving/prototype.py
@@ -31,7 +31,6 @@ from flufl.lock import Lock, TimeOutError
from mailbox import Maildir
from mailman.config import config
from mailman.interfaces.archiver import IArchiver
-from urllib.parse import urljoin
from zope.interface import implementer
@@ -53,23 +52,14 @@ class Prototype:
@staticmethod
def list_url(mlist):
"""See `IArchiver`."""
- return mlist.domain.base_url
+ # This archiver is not web-accessible, therefore no URL is returned.
+ return None
@staticmethod
def permalink(mlist, msg):
"""See `IArchiver`."""
- # It is the LMTP server's responsibility to ensure that the message has
- # a Message-ID-Hash header. For backward compatibility, fall back to
- # X-Message-ID-Hash. If the message has neither, then there's no
- # permalink.
- message_id_hash = msg.get('message-id-hash')
- if message_id_hash is None:
- message_id_hash = msg.get('x-message-id-hash')
- if message_id_hash is None:
- return None
- if isinstance(message_id_hash, bytes):
- message_id_hash = message_id_hash.decode('ascii')
- return urljoin(Prototype.list_url(mlist), message_id_hash)
+ # This archiver is not web-accessible, therefore no URL is returned.
+ return None
@staticmethod
def archive_message(mlist, message):
@@ -118,5 +108,4 @@ class Prototype:
message.get('message-id', 'n/a')))
finally:
lock.unlock(unconditionally=True)
- # Can we get return the URL of the archived message?
return None