diff options
| author | Barry Warsaw | 2014-12-22 13:40:30 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2014-12-22 13:40:30 -0500 |
| commit | 7d996dfa54e35053fb3518f29cd5368f88c085b8 (patch) | |
| tree | b4111954c2cd95578f92240686b8b23cd243a1a7 /src/mailman/app/moderator.py | |
| parent | 10b4557d9b0de2cb0ce40032e5b633165d6b9139 (diff) | |
| parent | 4173e7219271fa6ffc336c6a6d16b041cc62df12 (diff) | |
| download | mailman-7d996dfa54e35053fb3518f29cd5368f88c085b8.tar.gz mailman-7d996dfa54e35053fb3518f29cd5368f88c085b8.tar.zst mailman-7d996dfa54e35053fb3518f29cd5368f88c085b8.zip | |
Diffstat (limited to 'src/mailman/app/moderator.py')
| -rw-r--r-- | src/mailman/app/moderator.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mailman/app/moderator.py b/src/mailman/app/moderator.py index dc5cabd0a..e5fbc9044 100644 --- a/src/mailman/app/moderator.py +++ b/src/mailman/app/moderator.py @@ -31,7 +31,6 @@ __all__ = [ ] -import six import time import logging @@ -87,8 +86,8 @@ def hold_message(mlist, msg, msgdata=None, reason=None): message_id = msg.get('message-id') if message_id is None: msg['Message-ID'] = message_id = make_msgid() - assert isinstance(message_id, six.text_type), ( - 'Message-ID is not a unicode: %s' % message_id) + elif isinstance(message_id, bytes): + message_id = message_id.decode('ascii') getUtility(IMessageStore).add(msg) # Prepare the message metadata with some extra information needed only by # the moderation interface. |
