diff options
| -rw-r--r-- | Doc/library/bastion.rst | 5 | ||||
| -rw-r--r-- | Doc/library/rexec.rst | 5 | ||||
| -rw-r--r-- | Lib/Bastion.py | 3 | ||||
| -rw-r--r-- | Lib/rexec.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 3 |
5 files changed, 17 insertions, 2 deletions
diff --git a/Doc/library/bastion.rst b/Doc/library/bastion.rst index ac529af..cfc48a5 100644 --- a/Doc/library/bastion.rst +++ b/Doc/library/bastion.rst @@ -4,6 +4,11 @@ .. module:: Bastion :synopsis: Providing restricted access to objects. + :deprecated: + +.. deprecated:: 2.6 + The Bastion module has been removed in Python 3.0. + .. moduleauthor:: Barry Warsaw <bwarsaw@python.org> diff --git a/Doc/library/rexec.rst b/Doc/library/rexec.rst index c85c7ca..b61319f 100644 --- a/Doc/library/rexec.rst +++ b/Doc/library/rexec.rst @@ -4,7 +4,10 @@ .. module:: rexec :synopsis: Basic restricted execution framework. - + :deprecated: + +.. deprecated:: 2.6 + The rexec module has been removed in Python 3.0. .. versionchanged:: 2.3 Disabled module. diff --git a/Lib/Bastion.py b/Lib/Bastion.py index 93511b0..d0dddbf 100644 --- a/Lib/Bastion.py +++ b/Lib/Bastion.py @@ -25,6 +25,9 @@ the repr() of the original object. This is precomputed when the bastion is created. """ +from warnings import warnpy3k +warnpy3k("the Bastion module has been removed in Python 3.0", stacklevel=2) +del warnpy3k __all__ = ["BastionClass", "Bastion"] diff --git a/Lib/rexec.py b/Lib/rexec.py index 8c9cb9f..22b1bb2 100644 --- a/Lib/rexec.py +++ b/Lib/rexec.py @@ -16,6 +16,9 @@ XXX To do: - r_exec etc. with explicit globals/locals? (Use rexec("exec ... in ...")?) """ +from warnings import warnpy3k +warnpy3k("the rexec module has been removed in Python 3.0", stacklevel=2) +del warnpy3k import sys diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 48cd4e7..22257e1 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -128,7 +128,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') + all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec', + 'Bastion') inclusive_platforms = {'irix':('pure',)} def check_removal(self, module_name, optional=False): |