62d7207dd0
* Mon Aug 13 2012 David Malcolm <dmalcolm@redhat.com> - 3.3.0-0.3.b2 - 3.3b1 -> 3.3b2; drop upstreamed patch 152; refresh patches 3, 102, 111, 134, 153, 160; regenenerate autotools patch; rework systemtap patch to work correctly when LANG=C (patch 55); importlib.test was moved to test.test_importlib upstream
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
diff -up cpython-59223da36dec/Lib/test/test_email/test_email.py.remove-mimeaudio-tests cpython-59223da36dec/Lib/test/test_email/test_email.py
|
|
--- cpython-59223da36dec/Lib/test/test_email/test_email.py.remove-mimeaudio-tests 2012-08-07 16:39:41.698482943 -0400
|
|
+++ cpython-59223da36dec/Lib/test/test_email/test_email.py 2012-08-07 16:39:47.861482521 -0400
|
|
@@ -1307,47 +1307,6 @@ Blah blah blah
|
|
if x.startswith('>From ')]), 2)
|
|
|
|
|
|
-# Test the basic MIMEAudio class
|
|
-class TestMIMEAudio(unittest.TestCase):
|
|
- def setUp(self):
|
|
- with openfile('audiotest.au', 'rb') as fp:
|
|
- self._audiodata = fp.read()
|
|
- self._au = MIMEAudio(self._audiodata)
|
|
-
|
|
- def test_guess_minor_type(self):
|
|
- self.assertEqual(self._au.get_content_type(), 'audio/basic')
|
|
-
|
|
- def test_encoding(self):
|
|
- payload = self._au.get_payload()
|
|
- self.assertEqual(base64.decodebytes(bytes(payload, 'ascii')),
|
|
- self._audiodata)
|
|
-
|
|
- def test_checkSetMinor(self):
|
|
- au = MIMEAudio(self._audiodata, 'fish')
|
|
- self.assertEqual(au.get_content_type(), 'audio/fish')
|
|
-
|
|
- def test_add_header(self):
|
|
- eq = self.assertEqual
|
|
- unless = self.assertTrue
|
|
- self._au.add_header('Content-Disposition', 'attachment',
|
|
- filename='audiotest.au')
|
|
- eq(self._au['content-disposition'],
|
|
- 'attachment; filename="audiotest.au"')
|
|
- eq(self._au.get_params(header='content-disposition'),
|
|
- [('attachment', ''), ('filename', 'audiotest.au')])
|
|
- eq(self._au.get_param('filename', header='content-disposition'),
|
|
- 'audiotest.au')
|
|
- missing = []
|
|
- eq(self._au.get_param('attachment', header='content-disposition'), '')
|
|
- unless(self._au.get_param('foo', failobj=missing,
|
|
- header='content-disposition') is missing)
|
|
- # Try some missing stuff
|
|
- unless(self._au.get_param('foobar', missing) is missing)
|
|
- unless(self._au.get_param('attachment', missing,
|
|
- header='foobar') is missing)
|
|
-
|
|
-
|
|
-
|
|
# Test the basic MIMEImage class
|
|
class TestMIMEImage(unittest.TestCase):
|
|
def setUp(self):
|