diff options
Diffstat (limited to 'src/mailman/commands')
| -rw-r--r-- | src/mailman/commands/docs/unshunt.rst | 2 | ||||
| -rw-r--r-- | src/mailman/commands/eml_membership.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mailman/commands/docs/unshunt.rst b/src/mailman/commands/docs/unshunt.rst index 93d89f001..9532ae029 100644 --- a/src/mailman/commands/docs/unshunt.rst +++ b/src/mailman/commands/docs/unshunt.rst @@ -83,7 +83,7 @@ queue. 2 >>> sorted(item.msg['message-id'] for item in items) - [u'<badgers>', u'<crow>'] + ['<badgers>', '<crow>'] Return to the original queue diff --git a/src/mailman/commands/eml_membership.py b/src/mailman/commands/eml_membership.py index 617807783..542e6fd4d 100644 --- a/src/mailman/commands/eml_membership.py +++ b/src/mailman/commands/eml_membership.py @@ -72,6 +72,8 @@ used. print(_('$self.name: No valid address found to subscribe'), file=results) return ContinueProcessing.no + if not isinstance(address, unicode): + address = address.decode("ascii") # Have we already seen one join request from this user during the # processing of this email? joins = getattr(results, 'joins', set()) |