Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv3849

Modified Files:
      Tag: Release_2_1-maint
        admindb.py 
Log Message:
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.


Index: admindb.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admindb.py,v
retrieving revision 2.45.2.4
retrieving revision 2.45.2.5
diff -u -d -r2.45.2.4 -r2.45.2.5
--- admindb.py  27 Dec 2003 00:56:44 -0000      2.45.2.4
+++ admindb.py  27 Dec 2003 07:45:26 -0000      2.45.2.5
@@ -298,7 +298,9 @@
         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)
                       ])



_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to