diff options
-rw-r--r-- | Lib/multifile.py | 4 | ||||
-rw-r--r-- | Lib/test/test_multifile.py | 3 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/multifile.py b/Lib/multifile.py index e82a3fdeaf..35b0200c24 100644 --- a/Lib/multifile.py +++ b/Lib/multifile.py @@ -26,6 +26,10 @@ it normally attempts in order to make seeks relative to the beginning of the current file part. This may be useful when using MultiFile with a non- seekable stream object. """ +from warnings import warn +warn("the multifile module has been deprecated since Python 2.5", + DeprecationWarning, stacklevel=2) +del warn __all__ = ["MultiFile","Error"] diff --git a/Lib/test/test_multifile.py b/Lib/test/test_multifile.py index 437c394e1e..daf7ddefd8 100644 --- a/Lib/test/test_multifile.py +++ b/Lib/test/test_multifile.py @@ -1,5 +1,6 @@ +from test import test_support import mimetools -import multifile +multifile = test_support.import_module('multifile', deprecated=True) import cStringIO msg = """Mime-Version: 1.0 @@ -26,6 +26,8 @@ Extension Modules Library ------- +- The multifile module has been deprecated as per PEP 4. + - The SocketServer module has been renamed 'socketserver'. The old name is now deprecated. |