Mercurial > p > roundup > code
annotate test/test_mailer.py @ 5542:29346d92d80c
Fix email interfaces with Python 3 (issue 2550974, issue 2551000).
This patch fixes various issues handling incoming email with
roundup-mailgw with Python 3.
Incoming email must always be handled as bytes, not strings, because
it may contain 8-bit-encoded MIME parts with different encodings in
each part. When handling piped input, that means using
sys.stdin.buffer in Python 3 for binary input, along with
message_from_binary_file, not sys.stdin which is text input and may be
for the wrong encoding and not message_from_file. (In turn, tests
that use MailGW.main with text input are affected so an s2b call is
inserted in the test code and it is made to use BytesIO not StringIO.
Properly all the test messages in test_mailgw.py ought to use b''
explicitly rather than having such an s2b conversion, and there ought
to be test messages using 8-bit encodings with non-ASCII characters to
verify that that case works.)
imaplib and poplib return bytes not strings with Python 3 (from
inspection of the code, not tested), as is necessary for the above
reasons. Thus, the handling of IMAP and POP messages must expect
bytes and handle the data accordingly.
For messages from mailboxes, I saw the same problem described in issue
2551000 for a multipart message with a single (non-ASCII) part. The
Roundup code requires RoundupMessage not email.message.Message to be
used recursively for all MIME parts of a message. Because the mailbox
module uses email.message_from_* directly without passing the _class
argument to them, fixing this requires temporarily patching the email
module to ensure _class=RoundupMessage gets passed to those methods.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Sun, 16 Sep 2018 13:55:53 +0000 |
| parents | bc2e682e0305 |
| children | 95a366d46065 |
| rev | line source |
|---|---|
|
5248
198b6e810c67
Use Python-3-compatible 'as' syntax for except statements
Eric S. Raymond <esr@thyrsus.com>
parents:
5037
diff
changeset
|
1 #-*- encoding: utf-8 -*- |
|
4338
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2 import unittest |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3 |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
4 from roundup import mailer |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
5 |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
6 class EncodingTestCase(unittest.TestCase): |
|
4520
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
7 def testEncoding(self): |
|
4338
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
8 a = lambda n, a, c, o: self.assertEquals(mailer.nice_sender_header(n, |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
9 a, c), o) |
|
4520
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
10 a('ascii', 'ascii@test.com', 'iso8859-1', 'ascii <ascii@test.com>') |
|
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
11 a(u'café', 'ascii@test.com', 'iso8859-1', |
|
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
12 '=?iso8859-1?q?caf=E9?= <ascii@test.com>') |
|
5458
bc2e682e0305
fixed encoding issues in mailer
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5248
diff
changeset
|
13 a(u'café', 'ascii@test.com', 'utf-8', |
|
bc2e682e0305
fixed encoding issues in mailer
Christof Meerwald <cmeerw@cmeerw.org>
parents:
5248
diff
changeset
|
14 '=?utf-8?b?Y2Fmw6k=?= <ascii@test.com>') |
|
4520
182d8c41a3aa
Fix mailer encoding test:
Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
parents:
4338
diff
changeset
|
15 a('as"ii', 'ascii@test.com', 'iso8859-1', '"as\\"ii" <ascii@test.com>') |
|
4338
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
16 |
|
94ee533613ac
Attempt to generate more human-readable addresses in email
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
17 # vim: set et sts=4 sw=4 : |
