aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Cgi
diff options
context:
space:
mode:
authorbwarsaw <>2003-12-27 07:45:26 +0000
committerbwarsaw <>2003-12-27 07:45:26 +0000
commit750bbaa99e4cb546a037576980a96a790dd649ba (patch)
tree99f1a6ce3aeccb92ebc6b0448af5522a9948cf86 /Mailman/Cgi
parent00306de4d0465d78df10f98630b90045ba3cae77 (diff)
downloadmailman2-750bbaa99e4cb546a037576980a96a790dd649ba.tar.gz
mailman2-750bbaa99e4cb546a037576980a96a790dd649ba.tar.xz
mailman2-750bbaa99e4cb546a037576980a96a790dd649ba.zip
show_pending_subs(): The address in the pending database may be a unicode, but
it must be ascii. Coerce to an 8-bit string so the bogus u'' doesn't show up. Closes SF 862906.
Diffstat (limited to 'Mailman/Cgi')
-rw-r--r--Mailman/Cgi/admindb.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index d8092415..ab8c2af0 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -298,7 +298,9 @@ def show_pending_subs(mlist, form):
if addr not in mlist.ban_list:
radio += '<br>' + CheckBox('ban-%d' % id, 1).Format() + \
'&nbsp;' + _('Permanently ban from this list')
- table.AddRow(['%s<br><em>%s</em>' % (addr, fullname),
+ # While the address may be a unicode, it must be ascii
+ paddr = addr.encode('us-ascii', 'replace')
+ table.AddRow(['%s<br><em>%s</em>' % (paddr, fullname),
radio,
TextBox('comment-%d' % id, size=40)
])