From a360de383fd9e50f5ca008ef40c37e74ecaee488 Mon Sep 17 00:00:00 2001
From: tkikuchi <>
Date: Mon, 28 Mar 2005 01:37:51 +0000
Subject: Username may contain non-ascii character for English-US. Fall back to
 email address.

---
 Mailman/Handlers/Decorate.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Mailman/Handlers')

diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py
index 64ba8155..433629c6 100644
--- a/Mailman/Handlers/Decorate.py
+++ b/Mailman/Handlers/Decorate.py
@@ -53,10 +53,10 @@ def process(mlist, msg, msgdata):
             # BAW: Hmm, should we allow this?
             d['user_password'] = mlist.getMemberPassword(member)
             d['user_language'] = mlist.getMemberLanguage(member)
-            username = mlist.getMemberName(member)
-            if username:
+            username = mlist.getMemberName(member) or None
+            try:
                 username = username.encode(Utils.GetCharSet(d['user_language']))
-            else:
+            except (AttributeError, UnicodeEncodeError):
                 username = member
             d['user_name'] = username
             d['user_optionsurl'] = mlist.GetOptionsURL(member)
-- 
cgit v1.2.3