Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation.

diff --git a/Lib/MimeWriter.py b/Lib/MimeWriter.py
index 58c0a0bcf2a6854431972f0a0ed50e117f049869..e898f9ff231793672ae281c770666be8953be6ec 100644 (file)
--- a/Lib/MimeWriter.py
+++ b/Lib/MimeWriter.py
@@ -14,6 +14,11 @@ import mimetools
 
 __all__ = ["MimeWriter"]
 
+import warnings
+
+warnings.warn("the MimeWriter module is deprecated; use the email package instead",
+                DeprecationWarning, 2)
+
 class MimeWriter:
 
     """Generic MIME writer.

diff --git a/Lib/test/test_MimeWriter.py b/Lib/test/test_MimeWriter.py
index feca1631f2b34f0a870c77f22c94ad647f3ba2ab..5a20bf226b8d2e951eb88146fdfeb427c3e07d07 100644 (file)
--- a/Lib/test/test_MimeWriter.py
+++ b/Lib/test/test_MimeWriter.py
@@ -10,6 +10,10 @@ This should generate Barry's example, modulo some quotes and newlines.
 import unittest, sys, StringIO
 from test.test_support import run_unittest
 
+import warnings
+warnings.filterwarnings("ignore", "the MimeWriter module is deprecated.*",
+                        DeprecationWarning)
+
 from MimeWriter import MimeWriter
 
 SELLER = '''\

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 14795a6e60302ba8fadc6692cb3c73cd5f9854d0..071ed04251f2b0443c31d8d7aa5e863bc58eea2c 100644 (file)
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -7,6 +7,8 @@ warnings.filterwarnings("ignore", "the sets module is deprecated",
                         DeprecationWarning, "<string>")
 warnings.filterwarnings("ignore", ".*popen2 module is deprecated.*",
                         DeprecationWarning)
+warnings.filterwarnings("ignore", "the MimeWriter module is deprecated.*",
+                        DeprecationWarning)
 
 class AllTest(unittest.TestCase):
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 1ce32ceb0fca8b15c0afcaa7a63a612cbb00caf7..4ca7fa8da2aaae874657251c7c3170c754f57710 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -220,6 +220,8 @@ Core and builtins
 Library
 -------
 
+- MimeWriter now raises a DeprecationWarning upon import.
+
 - tarfile.py: Improved unicode support. Unicode input names are now
   officially supported. Added "errors" argument to the TarFile class.