From e94434bf2b3e1cfd34028a7bbc804ec8a8ee3788 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Mon, 15 Dec 2014 13:06:58 -0500
Subject: Use listid instead of (fqdn) listname in the metadata pickle.

load_external() now always opens in utf-8 mode.

More test repair.
---
 src/mailman/app/inject.py    | 2 +-
 src/mailman/app/moderator.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mailman/app')

diff --git a/src/mailman/app/inject.py b/src/mailman/app/inject.py
index 4c182657d..584bd7b8f 100644
--- a/src/mailman/app/inject.py
+++ b/src/mailman/app/inject.py
@@ -66,7 +66,7 @@ def inject_message(mlist, msg, recipients=None, switchboard=None, **kws):
         msg['Date'] = formatdate(localtime=True)
     msg.original_size = len(msg.as_string())
     msgdata = dict(
-        listname=mlist.fqdn_listname,
+        listid=mlist.list_id,
         original_size=msg.original_size,
         )
     msgdata.update(kws)
diff --git a/src/mailman/app/moderator.py b/src/mailman/app/moderator.py
index 9a65207a6..2a8c5f8c2 100644
--- a/src/mailman/app/moderator.py
+++ b/src/mailman/app/moderator.py
@@ -93,7 +93,7 @@ def hold_message(mlist, msg, msgdata=None, reason=None):
     # Prepare the message metadata with some extra information needed only by
     # the moderation interface.
     msgdata['_mod_message_id'] = message_id
-    msgdata['_mod_fqdn_listname'] = mlist.fqdn_listname
+    msgdata['_mod_listid'] = mlist.list_id
     msgdata['_mod_sender'] = msg.sender
     msgdata['_mod_subject'] = msg.get('subject', _('(no subject)'))
     msgdata['_mod_reason'] = reason
-- 
cgit v1.2.3-70-g09d2