mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2016-05-06 17:35:21 -04:00
parent cc20d63e64 f73a48cbb2
commit 234480df1c
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_email/test_asian_codecs.py
View File

@ -4,7 +4,7 @@
import unittest import unittest
from test.test_email.test_email import TestEmailBase from test.test_email import TestEmailBase
from email.charset import Charset from email.charset import Charset
from email.header import Header, decode_header from email.header import Header, decode_header
from email.message import Message from email.message import Message
@ -17,7 +17,7 @@
raise unittest.SkipTest raise unittest.SkipTest
class TestEmailAsianCodecs(TestEmailBase): class TestEmailAsianCodecs(TestEmailBase):
def test_japanese_codecs(self): def test_japanese_codecs(self):
eq = self.ndiffAssertEqual eq = self.ndiffAssertEqual
@ -76,6 +76,6 @@ def test_payload_encoding(self):
self.assertEqual(jhello, ustr) self.assertEqual(jhello, ustr)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

15
Lib/test/test_email/torture_test.py
View File

@ -10,10 +10,9 @@
import os import os
import unittest import unittest
from io import StringIO from io import StringIO
from types import ListType
from email.test.test_email import TestEmailBase from test.test_email import TestEmailBase
from test.support import TestSkipped, run_unittest from test.support import run_unittest
import email import email
from email import __file__ as testfile from email import __file__ as testfile
@ -28,10 +27,10 @@ def openfile(filename):
try: try:
openfile('crispin-torture.txt') openfile('crispin-torture.txt')
except OSError: except OSError:
raise TestSkipped raise unittest.SkipTest
class TortureBase(TestEmailBase): class TortureBase(TestEmailBase):
def _msgobj(self, filename): def _msgobj(self, filename):
fp = openfile(filename) fp = openfile(filename)
@ -42,7 +41,7 @@ def _msgobj(self, filename):
return msg return msg
class TestCrispinTorture(TortureBase): class TestCrispinTorture(TortureBase):
# Mark Crispin's torture test from the SquirrelMail project # Mark Crispin's torture test from the SquirrelMail project
def test_mondo_message(self): def test_mondo_message(self):
@ -50,7 +49,7 @@ def test_mondo_message(self):
neq = self.ndiffAssertEqual neq = self.ndiffAssertEqual
msg = self._msgobj('crispin-torture.txt') msg = self._msgobj('crispin-torture.txt')
payload = msg.get_payload() payload = msg.get_payload()
eq(type(payload), ListType) eq(type(payload), list)
eq(len(payload), 12) eq(len(payload), 12)
eq(msg.preamble, None) eq(msg.preamble, None)
eq(msg.epilogue, '\n') eq(msg.epilogue, '\n')
@ -113,7 +112,6 @@ def test_mondo_message(self):
audio/x-sun audio/x-sun
""") """)
def _testclasses(): def _testclasses():
mod = sys.modules[__name__] mod = sys.modules[__name__]
return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')] return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
@ -131,6 +129,5 @@ def test_main():
run_unittest(testclass) run_unittest(testclass)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main(defaultTest='suite') unittest.main(defaultTest='suite')