From 27508d4eb98fba5e092a742fc241760b5f796985 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sat, 10 May 2008 22:45:07 +0000 Subject: Deprecate ihooks for removal in 3.0. --- Doc/library/undoc.rst | 2 ++ Lib/ihooks.py | 4 +++- Lib/test/test_py3kwarn.py | 3 ++- Misc/NEWS | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst index 856cf86..deff5e2 100644 --- a/Doc/library/undoc.rst +++ b/Doc/library/undoc.rst @@ -21,6 +21,8 @@ Some of these are very old and/or not very robust; marked with "hmm." :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 diff --git a/Lib/ihooks.py b/Lib/ihooks.py index f5b93ab..86b0f65 100644 --- a/Lib/ihooks.py +++ b/Lib/ihooks.py @@ -49,7 +49,9 @@ by the way the __import__ hook is used by the Python interpreter.) It 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 diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 8c3c857..3371697 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -129,7 +129,8 @@ class TestStdlibRemovals(unittest.TestCase): # 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') diff --git a/Misc/NEWS b/Misc/NEWS index c1a3038..12adf3d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -23,6 +23,8 @@ Extension Modules 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. -- cgit v0.12