Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Adjust tests for no newline appending to MIMEText.__init__()'s _text 

argument.
This commit is contained in:
Barry Warsaw 2003-03-11 05:04:54 +00:00
parent cbec700b49
commit bd757ba1ed
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/email/test/test_email.py
View File

@ -484,21 +484,21 @@ class TestEncoders(unittest.TestCase):
def test_encode_noop(self): def test_encode_noop(self):
eq = self.assertEqual eq = self.assertEqual
msg = MIMEText('hello world', _encoder=Encoders.encode_noop) msg = MIMEText('hello world', _encoder=Encoders.encode_noop)
eq(msg.get_payload(), 'hello world\n') eq(msg.get_payload(), 'hello world')
def test_encode_7bit(self): def test_encode_7bit(self):
eq = self.assertEqual eq = self.assertEqual
msg = MIMEText('hello world', _encoder=Encoders.encode_7or8bit) msg = MIMEText('hello world', _encoder=Encoders.encode_7or8bit)
eq(msg.get_payload(), 'hello world\n') eq(msg.get_payload(), 'hello world')
eq(msg['content-transfer-encoding'], '7bit') eq(msg['content-transfer-encoding'], '7bit')
msg = MIMEText('hello \x7f world', _encoder=Encoders.encode_7or8bit) msg = MIMEText('hello \x7f world', _encoder=Encoders.encode_7or8bit)
eq(msg.get_payload(), 'hello \x7f world\n') eq(msg.get_payload(), 'hello \x7f world')
eq(msg['content-transfer-encoding'], '7bit') eq(msg['content-transfer-encoding'], '7bit')
def test_encode_8bit(self): def test_encode_8bit(self):
eq = self.assertEqual eq = self.assertEqual
msg = MIMEText('hello \x80 world', _encoder=Encoders.encode_7or8bit) msg = MIMEText('hello \x80 world', _encoder=Encoders.encode_7or8bit)
eq(msg.get_payload(), 'hello \x80 world\n') eq(msg.get_payload(), 'hello \x80 world')
eq(msg['content-transfer-encoding'], '8bit') eq(msg['content-transfer-encoding'], '8bit')
def test_encode_empty_payload(self): def test_encode_empty_payload(self):
@ -510,13 +510,13 @@ class TestEncoders(unittest.TestCase):
def test_encode_base64(self): def test_encode_base64(self):
eq = self.assertEqual eq = self.assertEqual
msg = MIMEText('hello world', _encoder=Encoders.encode_base64) msg = MIMEText('hello world', _encoder=Encoders.encode_base64)
eq(msg.get_payload(), 'aGVsbG8gd29ybGQK\n') eq(msg.get_payload(), 'aGVsbG8gd29ybGQ=')
eq(msg['content-transfer-encoding'], 'base64') eq(msg['content-transfer-encoding'], 'base64')
def test_encode_quoted_printable(self): def test_encode_quoted_printable(self):
eq = self.assertEqual eq = self.assertEqual
msg = MIMEText('hello world', _encoder=Encoders.encode_quopri) msg = MIMEText('hello world', _encoder=Encoders.encode_quopri)
eq(msg.get_payload(), 'hello=20world\n') eq(msg.get_payload(), 'hello=20world')
eq(msg['content-transfer-encoding'], 'quoted-printable') eq(msg['content-transfer-encoding'], 'quoted-printable')
def test_default_cte(self): def test_default_cte(self):
@ -1005,7 +1005,7 @@ class TestMIMEText(unittest.TestCase):
is missing) is missing)
def test_payload(self): def test_payload(self):
self.assertEqual(self._msg.get_payload(), 'hello there\n') self.assertEqual(self._msg.get_payload(), 'hello there')
self.failUnless(not self._msg.is_multipart()) self.failUnless(not self._msg.is_multipart())
def test_charset(self): def test_charset(self):
@ -1123,7 +1123,6 @@ MIME-Version: 1.0
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
hello world hello world
--BOUNDARY-- --BOUNDARY--
''') ''')
@ -1151,7 +1150,6 @@ MIME-Version: 1.0
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
hello world hello world
--BOUNDARY-- --BOUNDARY--
''') ''')
@ -1471,14 +1469,12 @@ MIME-Version: 1.0
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
One One
--BOUNDARY --BOUNDARY
Content-Type: text/plain; charset="us-ascii" Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
Two Two
--BOUNDARY-- --BOUNDARY--
""") """)