From e5db2636f3fedd772e55ce55e4cf820475f29fe3 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 20 Nov 2010 15:10:13 +0000 Subject: [PATCH] Improve TestBytesGeneratorIdempotent using by using linesep. Also corrects a typo from a previous commit. Unfortunately this does *not* fix issue #10134. --- Lib/email/test/test_email.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 34af77740a..89effcb71d 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -77,7 +77,7 @@ class TestMessageAPI(TestEmailBase): eq(msg.get_all('cc'), ['ccc@zzz.org', 'ddd@zzz.org', 'eee@zzz.org']) eq(msg.get_all('xx', 'n/a'), 'n/a') - def TEst_getset_charset(self): + def test_getset_charset(self): eq = self.assertEqual msg = Message() eq(msg.get_charset(), None) @@ -2957,6 +2957,8 @@ class Test8BitBytesHandling(unittest.TestCase): class TestBytesGeneratorIdempotent(TestIdempotent): + maxDiff = None + def _msgobj(self, filename): with openfile(filename, 'rb') as fp: data = fp.read() @@ -2964,14 +2966,14 @@ class TestBytesGeneratorIdempotent(TestIdempotent): return msg, data def _idempotent(self, msg, data): + # 13 = b'\r' + linesep = '\r\n' if data[data.index(b'\n')-1] == 13 else '\n' b = BytesIO() g = email.generator.BytesGenerator(b, maxheaderlen=0) - g.flatten(msg) - self.assertEqual(data, b.getvalue()) - - maxDiff = None + g.flatten(msg, linesep=linesep) + self.assertByteStringsEqual(data, b.getvalue()) - def assertEqual(self, str1, str2): + def assertByteStringsEqual(self, str1, str2): self.assertListEqual(str1.split(b'\n'), str2.split(b'\n')) -- 2.40.0