diff --git a/Doc/library/imputil.rst b/Doc/library/imputil.rst index 34117fab0f0..f10e83d3086 100644 --- a/Doc/library/imputil.rst +++ b/Doc/library/imputil.rst @@ -4,6 +4,10 @@ .. module:: imputil :synopsis: Manage and augment the import process. + :deprecated: + +.. deprecated:: 2.6 + The module has been removed in Python 3.0. .. index:: statement: import diff --git a/Lib/imputil.py b/Lib/imputil.py index 675a634db30..0eba43544e0 100644 --- a/Lib/imputil.py +++ b/Lib/imputil.py @@ -9,6 +9,9 @@ Exported classes: DynLoadSuffixImporter """ +from warnings import warnpy3k +warnpy3k("the imputil module has been removed in Python 3.0", stacklevel=2) +del warnpy3k # note: avoid importing non-builtin modules import imp ### not available in JPython? diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 2850bf2b5b9..0b0b92d8d65 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -126,7 +126,7 @@ class TestPy3KWarnings(unittest.TestCase): class TestStdlibRemovals(unittest.TestCase): - all_platforms = ('audiodev',) + all_platforms = ('audiodev', 'imputil') def check_removal(self, module_name): """Make sure the specified module, when imported, raises a diff --git a/Misc/NEWS b/Misc/NEWS index 4a193945eb5..7d634b66090 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4,6 +4,25 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.6 beta 1? +================================ + +*Release date: XX-June-2008* + +Core and Builtins +----------------- + +Extension Modules +----------------- + +Library +------- + +- The imputil module has been deprecated for removal in Python 3.0. + +Build +----- + What's New in Python 2.6 alpha 3? =================================