Deprecate Bastion and rexec for 3.0.

diff --git a/Doc/library/bastion.rst b/Doc/library/bastion.rst
index ac529aff3c9cad504d0aa6c66f4fce29ceb0ee2b..cfc48a5eb5998e7ecbf0be4af920b0cd824d7f46 100644 (file)
--- 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 c85c7ca77248bb08291cff8fcbc950986518d371..b61319f891b686a5772b2d798f73365ea092a010 100644 (file)
--- 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 93511b0a948513f989006f6e1e0c4387ab266c1c..d0dddbfdefcac103c0e290fe844891cedac94751 100644 (file)
--- 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 8c9cb9f1e59a4c40cf5e024be2d57ab01bc0b7f9..22b1bb26228897dda6df1439cde6d8aba1e17b66 100644 (file)
--- 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 48cd4e70154066c38cc4578c0b3c30de052497f0..22257e1d1e697ad8308fd501d2e50a8a44ba1bab 100644 (file)
--- 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):