------------------------------------------------------------
revno: 1296
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Sun 2013-12-01 13:34:00 -0800
message:
Fixed a possible TypeError in bin/sync_members introduced in 2.1.17.
modified:
NEWS
bin/sync_members
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'NEWS'
--- NEWS 2013-11-23 18:53:42 +0000
+++ NEWS 2013-12-01 21:34:00 +0000
@@ -49,6 +49,13 @@
archive to emphasize that even if you got to the message from a
subject, date or author index, previous and next are still by thread.
+2.1.18 (xx-xxx-xxxx)
+
+ Bug Fixes and other patches
+
+ - Fixed a possible TypeError in bin/sync_members introduced in 2.1.17.
+ (LP: #1243343)
+
2.1.17 (23-Nov-2013)
New Features
=== modified file 'bin/sync_members'
--- bin/sync_members 2013-10-22 18:17:53 +0000
+++ bin/sync_members 2013-12-01 21:34:00 +0000
@@ -257,7 +257,9 @@
if not dryrun:
mlist.ApprovedAddMember(userdesc, welcome, notifyadmin)
# Avoid UnicodeError if name can't be decoded
- name = unicode(name, errors='replace').encode(enc, 'replace')
+ if isinstance(name, str):
+ name = unicode(name, errors='replace')
+ name = name.encode(enc, 'replace')
s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
print _('Added : %(s)s')
except Errors.MMAlreadyAMember:
@@ -279,7 +281,9 @@
# 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')
+ if isinstance(name, str):
+ name = unicode(name, errors='replace')
+ name = name.encode(enc, 'replace')
s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
print _('Removed: %(s)s')
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
