[Python-checkins] r62879 - in python/trunk: Doc/library/imputil.rst Lib/imputil.py Lib/test/test_py3kwarn.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Thu May  8 20:15:14 2008
New Revision: 62879

Log:
Deprecate the imputil module for removal in 3.0.


Modified:
   python/trunk/Doc/library/imputil.rst
   python/trunk/Lib/imputil.py
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Doc/library/imputil.rst
==============================================================================
--- python/trunk/Doc/library/imputil.rst	(original)
+++ python/trunk/Doc/library/imputil.rst	Thu May  8 20:15:14 2008
@@ -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

Modified: python/trunk/Lib/imputil.py
==============================================================================
--- python/trunk/Lib/imputil.py	(original)
+++ python/trunk/Lib/imputil.py	Thu May  8 20:15:14 2008
@@ -9,6 +9,9 @@
 
     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?

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Thu May  8 20:15:14 2008
@@ -126,7 +126,7 @@
 
 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

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu May  8 20:15:14 2008
@@ -4,6 +4,25 @@
 
 (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?
 =================================