From e91cf963e2fa42c6fedcc8f2df774bc8bb7936d2 Mon Sep 17 00:00:00 2001 From: bwarsaw Date: Thu, 13 Mar 2003 15:54:39 +0000 Subject: safe(): Fix typos. main(): Fix dumb coding mistakes so name is always a string. --- bin/list_members | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/list_members b/bin/list_members index 3306b2e94..b4fdbb27e 100755 --- a/bin/list_members +++ b/bin/list_members @@ -95,12 +95,12 @@ def usage(code, msg=''): -def safe(addr): - if addr is None: +def safe(s): + if not s: return '' - if isinstance(addr, UnicodeType): - return addr.encode(ENC, 'replace') - return unicode(addr, ENC, 'replace').encode(ENC, 'replace') + if isinstance(s, UnicodeType): + return s.encode(ENC, 'replace') + return unicode(s, ENC, 'replace').encode(ENC, 'replace') @@ -211,7 +211,7 @@ def main(): if regular: rmembers.sort() for addr in rmembers: - name = fullnames and mlist.getMemberName(addr) + name = fullnames and mlist.getMemberName(addr) or '' # Filter out nomails if nomail and not whymatches(mlist, addr, why): continue @@ -219,7 +219,7 @@ def main(): if digest: dmembers.sort() for addr in dmembers: - name = fullnames and mlist.getMemberName(addr) + name = fullnames and mlist.getMemberName(addr) or '' # Filter out nomails if nomail and not whymatches(mlist, addr, why): continue -- cgit v1.3.1