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

[brett.cannon]

Author: brett.cannon
Date: Sun May 11 00:45:07 2008
New Revision: 63018

Log:
Deprecate ihooks for removal in 3.0.

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

Modified: python/trunk/Doc/library/undoc.rst
==============================================================================
--- python/trunk/Doc/library/undoc.rst	(original)
+++ python/trunk/Doc/library/undoc.rst	Sun May 11 00:45:07 2008
@@ -21,6 +21,8 @@
 
 :mod:`ihooks`
    --- Import hook support (for :mod:`rexec`; may become obsolete).
+   
+   .. warning:: The ihooks module has been removed in Python 3.0.
 
 
 Platform specific modules

Modified: python/trunk/Lib/ihooks.py
==============================================================================
--- python/trunk/Lib/ihooks.py	(original)
+++ python/trunk/Lib/ihooks.py	Sun May 11 00:45:07 2008
@@ -49,7 +49,9 @@
 would also do wise to install a different version of reload().
 
 """
-
+from warnings import warnpy3k
+warnpy3k("the ihooks module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import __builtin__
 import imp

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Sun May 11 00:45:07 2008
@@ -129,7 +129,8 @@
     # test.testall not tested as it executes all unit tests as an
     # import side-effect.
     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
-                        'Bastion', 'compiler', 'dircache', 'fpformat')
+                        'Bastion', 'compiler', 'dircache', 'fpformat',
+                        'ihooks')
     inclusive_platforms = {'irix':('pure',)}
     # XXX Don't know if lib-tk is only installed if _tkinter is built.
     optional_modules = ('bsddb185', 'Canvas', 'dl')

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun May 11 00:45:07 2008
@@ -23,6 +23,8 @@
 Library
 -------
 
+- The ihooks module has been deprecated for removal in Python 3.0.
+
 - The fpformat module has been deprecated for removal in Python 3.0.
 
 - The dl module has been deprecated for removal in Python 3.0.