From: Michael W. Hudson <mwh@python.net>
Date: Mon, 28 Jan 2002 15:31:14 +0000 (+0000)
Subject: It's merge time!
X-Git-Tag: v2.2.1c1~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c62623861f95551f9600fa6c3ffc3f3c5a49b43;p=thirdparty%2FPython%2Fcpython.git

It's merge time!

Backport bwarsaw's checkin of revision 1.25:

test_multipart_one_part(): Idempotency test case for a multipart/*
with only one subpart.
---

diff --git a/Lib/test/test_email.py b/Lib/test/test_email.py
index 5be7e95d9a9d..7105f7d4b31b 100644
--- a/Lib/test/test_email.py
+++ b/Lib/test/test_email.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001 Python Software Foundation
+# Copyright (C) 2001,2002 Python Software Foundation
 # email package unit tests
 
 import os
@@ -790,6 +790,10 @@ class TestIdempotent(unittest.TestCase):
         msg, text = self._msgobj('msg_21.txt')
         self._idempotent(msg, text)
 
+    def test_multipart_one_part(self):
+        msg, text = self._msgobj('msg_23.txt')
+        self._idempotent(msg, text)
+
     def test_content_type(self):
         eq = self.assertEquals
         # Get a message object and reset the seek pointer for other tests