aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2013-10-22 11:16:35 -0700
committerMark Sapiro <mark@msapiro.net>2013-10-22 11:16:35 -0700
commitc2f599fd9b708faf45d8dd621cdd89cc814f60d5 (patch)
tree1a66f510506b20937de9ab7d0f217ff1546b1e9a /bin
parentf46599dded26bad36be5a89bd26d5ea1a5ca95ab (diff)
downloadmailman2-c2f599fd9b708faf45d8dd621cdd89cc814f60d5.tar.gz
mailman2-c2f599fd9b708faf45d8dd621cdd89cc814f60d5.tar.xz
mailman2-c2f599fd9b708faf45d8dd621cdd89cc814f60d5.zip
Fixed a possible UnicodeDecodeError in bin/sync_members.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/sync_members6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/sync_members b/bin/sync_members
index 13d0b2b0..58262841 100755
--- a/bin/sync_members
+++ b/bin/sync_members
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -256,6 +256,8 @@ def main():
try:
if not dryrun:
mlist.ApprovedAddMember(userdesc, welcome, notifyadmin)
+ # Avoid UnicodeError if name can't be decoded
+ name = unicode(name, errors='replace').encode(enc, 'replace')
s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
print _('Added : %(s)s')
except Errors.MMAlreadyAMember:
@@ -276,6 +278,8 @@ def main():
# reasons is in the database. Use a lower level remove to
# get rid of this member's entry
mlist.removeMember(addr)
+ # Avoid UnicodeError if name can't be decoded
+ name = unicode(name, errors='replace').encode(enc, 'replace')
s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
print _('Removed: %(s)s')