diff options
Diffstat (limited to 'src/mailman/email')
| -rw-r--r-- | src/mailman/email/message.py | 2 | ||||
| -rw-r--r-- | src/mailman/email/tests/test_message.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py index 21bdfd30d..6ddedc48e 100644 --- a/src/mailman/email/message.py +++ b/src/mailman/email/message.py @@ -126,7 +126,7 @@ class Message(email.message.Message): for sender in senders: if not sender: continue - if not isinstance(sender, unicode): + if isinstance(sender, bytes): sender = sender.decode("ascii") clean_senders.append(sender) return clean_senders diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py index 54519fa6b..122562d0a 100644 --- a/src/mailman/email/tests/test_message.py +++ b/src/mailman/email/tests/test_message.py @@ -87,7 +87,6 @@ Test content attachment = msg.get_payload()[1] try: filename = attachment.get_filename() - except TypeError, e: - raise + except TypeError as e: self.fail(e) self.assertEqual(filename, u"d\xe9jeuner.txt") |
