new(): Slight code cleanup; _ALLKEYS holds a list of 1-tuples of all

the valid Pending types.  (They're 1-tuples so that the assert is more
robust).

1 files changed, 5 insertions, 5 deletions

diff --git a/Mailman/Pending.py b/Mailman/Pending.py
index bbd7bf0ef..7d45f215b 100644
--- a/Mailman/Pending.py
+++ b/Mailman/Pending.py
@@ -41,17 +41,17 @@ UNSUBSCRIPTION = 'U'
 CHANGE_OF_ADDRESS = 'C'
 HELD_MESSAGE = 'H'
 
+_ALLKEYS = [(x,) for x in (SUBSCRIPTION, UNSUBSCRIPTION,
+                           CHANGE_OF_ADDRESS, HELD_MESSAGE,
+                           )]
+
 
 
 def new(*content):
     """Create a new entry in the pending database, returning cookie for it."""
     # It's a programming error if this assertion fails!  We do it this way so
     # the assert test won't fail if the sequence is empty.
-    assert content[:1] in ((SUBSCRIPTION,),
-                           (UNSUBSCRIPTION,),
-                           (CHANGE_OF_ADDRESS,),
-                           (HELD_MESSAGE,),
-                           )
+    assert content[:1] in _ALLKEYS
     # Acquire the pending database lock, letting TimeOutError percolate up.
     lock = LockFile.LockFile(LOCKFILE)
     lock.lock(timeout=30)