Make sure that Pendables always have a type

5 files changed, 6 insertions, 4 deletions

diff --git a/src/mailman/app/bounces.py b/src/mailman/app/bounces.py
index e6207721c..ef8df15cd 100644
--- a/src/mailman/app/bounces.py
+++ b/src/mailman/app/bounces.py
@@ -176,6 +176,7 @@ class ProbeVERP(_BaseVERPParser):
 @implementer(IPendable)
 class _ProbePendable(dict):
     """The pendable dictionary for probe messages."""
+    PEND_TYPE = 'probe'
 
 
 def send_probe(member, msg):
diff --git a/src/mailman/app/docs/moderator.rst b/src/mailman/app/docs/moderator.rst
index 13dba1f37..bf8a8e5df 100644
--- a/src/mailman/app/docs/moderator.rst
+++ b/src/mailman/app/docs/moderator.rst
@@ -168,6 +168,7 @@ however the message metadata indicates that the message has been approved.
     _parsemsg         : False
     approved          : True
     moderator_approved: True
+    type              : data
     version           : 3
 
 
diff --git a/src/mailman/app/registrar.py b/src/mailman/app/registrar.py
index 1b051a7f3..bdc271964 100644
--- a/src/mailman/app/registrar.py
+++ b/src/mailman/app/registrar.py
@@ -43,7 +43,7 @@ log = logging.getLogger('mailman.error')
 
 @implementer(IPendable)
 class PendableRegistration(dict):
-    PEND_KEY = 'registration'
+    PEND_TYPE = 'registration'
 
 
 
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py
index 0ff7dac6b..19e77e0ef 100644
--- a/src/mailman/app/subscriptions.py
+++ b/src/mailman/app/subscriptions.py
@@ -68,7 +68,7 @@ class WhichSubscriber(Enum):
 
 @implementer(IPendable)
 class Pendable(dict):
-    pass
+    PEND_TYPE = 'subscription'
 
 
 
diff --git a/src/mailman/app/tests/test_bounces.py b/src/mailman/app/tests/test_bounces.py
index ef77d88a0..5564b964a 100644
--- a/src/mailman/app/tests/test_bounces.py
+++ b/src/mailman/app/tests/test_bounces.py
@@ -207,9 +207,9 @@ Message-ID: <first>
         # corresponds to a record in the pending database.
         token = send_probe(self._member, self._msg)
         pendable = getUtility(IPendings).confirm(token)
-        self.assertEqual(len(pendable.items()), 2)
+        self.assertEqual(len(pendable.items()), 3)
         self.assertEqual(set(pendable.keys()),
-                         set(['member_id', 'message_id']))
+                         set(['member_id', 'message_id', 'type']))
         # member_ids are pended as unicodes.
         self.assertEqual(uuid.UUID(hex=pendable['member_id']),
                          self._member.member_id)