process_form(): When listing a user's other subscriptions, don't use

map_maillists() -- which has been removed anyway -- because the
locking semantics interacted poorly.  optionslinks() has been modified
to take a listname instead of a MailList object, and it opens the list
unlocked.  Good ol' built-in map() is used now instead.

1 files changed, 9 insertions, 8 deletions

diff --git a/Mailman/Cgi/handle_opts.py b/Mailman/Cgi/handle_opts.py
index a28e687b7..afaa32da4 100644
--- a/Mailman/Cgi/handle_opts.py
+++ b/Mailman/Cgi/handle_opts.py
@@ -153,18 +153,19 @@ def process_form(mlist, user, doc):
             doc.AddItem("Click a link to visit your options page for"
                         " that mailing list:")
 
-            def optionslinks(l, user=user):
-                addrs = Utils.FindMatchingAddresses(user, l.members,
-                                                    l.digest_members)
+            def optionslinks(listname, user=user):
+                mlist = MailList.MailList(listname, lock=0)
+                addrs = Utils.FindMatchingAddresses(user, mlist.members,
+                                                    mlist.digest_members)
                 if addrs:
                     addr = Utils.ObscureEmail(addrs[0])
-                    if l.obscure_addresses:
+                    if mlist.obscure_addresses:
                         addr = Utils.ObscureEmail(addr)
-                    url = l.GetAbsoluteOptionsURL(addr)
-                    link = Link(url, l.real_name)
-                    return l._internal_name, link
+                    url = mlist.GetAbsoluteOptionsURL(addr)
+                    link = Link(url, mlist.real_name)
+                    return mlist.internal_name(), link
 
-            all_links = filter(None, Utils.map_maillists(optionslinks))
+            all_links = filter(None, map(optionslinks, Utils.list_names()))
             all_links.sort()
             items = OrderedList()
             for name, link in all_links: