[Pkg-mailman-hackers] Pkg-mailman commit - rev 228 - trunk/debian/patches

[Lionel Elie Mamane]

Author: lmamane-guest
Date: 2005-11-15 00:00:25 +0000 (Tue, 15 Nov 2005)
New Revision: 228

Modified:
   trunk/debian/patches/74_admin_non-ascii_emails.dpatch
Log:
Update patch for #315358 to the one given by Peter Gervai <grin at grin.hu>
Lionel's broke case of unicode strings containing only ASCII characters.


Modified: trunk/debian/patches/74_admin_non-ascii_emails.dpatch
===================================================================
--- trunk/debian/patches/74_admin_non-ascii_emails.dpatch	2005-11-14 23:12:43 UTC (rev 227)
+++ trunk/debian/patches/74_admin_non-ascii_emails.dpatch	2005-11-15 00:00:25 UTC (rev 228)
@@ -7,13 +7,18 @@
 @DPATCH@
 diff -urNad mailman-2.1.5~/Mailman/Cgi/admin.py mailman-2.1.5/Mailman/Cgi/admin.py
 --- mailman-2.1.5~/Mailman/Cgi/admin.py	2003-12-24 18:27:45.000000000 +0100
-+++ mailman-2.1.5/Mailman/Cgi/admin.py	2005-11-14 00:51:45.409005398 +0100
-@@ -867,7 +867,7 @@
++++ mailman-2.1.5/Mailman/Cgi/admin.py	2005-11-15 00:55:12.881669479 +0100
+@@ -867,7 +867,12 @@
      chunksz = mlist.admin_member_chunksize
      # The email addresses had /better/ be ASCII, but might be encoded in the
      # database as Unicodes.
 -    all = [_m.encode() for _m in mlist.getMembers()]
-+    all = mlist.getMembers()
++    all = []
++    for _m in mlist.getMembers():
++        try:
++            all.append( _m.encode() )
++        except:
++            all.append( _m )
      all.sort(lambda x, y: cmp(x.lower(), y.lower()))
      # See if the query has a regular expression
      regexp = cgidata.getvalue('findmember', '').strip()