Merge lp:~xtaran/mailman/mailman-improvements into lp:mailman/2.1

[Axel Beckert]

Add two options named -m (--moderated) and -M (--non-moderated) to list_members to list either only moderated list members or only non-moderated list members.

[Bernard (unowned60)]

Options name 24/7 single man, list members, thanks!

review: Needs Resubmitting (24 / 7)

[Bernard (unowned60)]

yes, a 24/7!

review: Approve (24 / 7)

[Mark Sapiro (msapiro)]

Somehow this fell into the cracks, but better late than never I suppose. Merged with a few tweaksfor MM 2.1.21.

review: Approve (code)

[Axel Beckert (xtaran)]

Thanks, appreciated!

=== modified file 'bin/list_members'
--- bin/list_members	2005-08-27 01:40:17 +0000
+++ bin/list_members	2012-03-01 20:09:22 +0000
@@ -34,6 +34,12 @@
         "plain" which prints just the digest members receiving that kind of
         digest.
 
+    --moderated / -m
+        Print just the moderated members.
+
+    --non-moderated / -M
+        Print just the non-moderated members.
+
     --nomail[=why] / -n [why]
         Print the members that have delivery disabled.  Optional argument can
         be "byadmin", "byuser", "bybounce", or "unknown" which prints just the
@@ -154,6 +160,8 @@
     fullnames = False
     invalidonly = False
     unicodeonly = False
+    moderatedonly = False
+    nonmoderatedonly = False
 
     # Throw away the first (program) argument
     args = sys.argv[1:]
@@ -173,6 +181,10 @@
             preserve = True
         elif opt in ('-r', '--regular'):
             regular = True
+        elif opt in ('-m', '--moderated'):
+            moderatedonly = True
+        elif opt in ('-M', '--non-moderated'):
+            nonmoderatedonly = True
         elif opt in ('-o', '--output'):
             try:
                 outfile = args.pop(0)
@@ -241,7 +253,7 @@
         rmembers = mlist.getMemberCPAddresses(rmembers)
         dmembers = mlist.getMemberCPAddresses(dmembers)
 
-    if invalidonly or unicodeonly:
+    if invalidonly or unicodeonly or moderatedonly or nonmoderatedonly:
         all = rmembers + dmembers
         all.sort()
         for addr in all:
@@ -251,6 +263,10 @@
                 showit = True
             if unicodeonly and isunicode(addr):
                 showit = True
+            if moderatedonly and mlist.getMemberOption(addr, mm_cfg.Moderate):
+                showit = True
+            if nonmoderatedonly and not mlist.getMemberOption(addr, mm_cfg.Moderate):
+                showit = True
             if showit:
                 print >> fp, formataddr((safe(name), addr))
         return