[Python-checkins] r62968 - in python/trunk: Doc/library/bastion.rst Doc/library/rexec.rst Lib/Bastion.py Lib/rexec.py Lib/test/test_py3kwarn.py

[brett.cannon]

Author: brett.cannon
Date: Sat May 10 04:27:04 2008
New Revision: 62968

Log:
Deprecate Bastion and rexec for 3.0.


Modified:
   python/trunk/Doc/library/bastion.rst
   python/trunk/Doc/library/rexec.rst
   python/trunk/Lib/Bastion.py
   python/trunk/Lib/rexec.py
   python/trunk/Lib/test/test_py3kwarn.py

Modified: python/trunk/Doc/library/bastion.rst
==============================================================================
--- python/trunk/Doc/library/bastion.rst	(original)
+++ python/trunk/Doc/library/bastion.rst	Sat May 10 04:27:04 2008
@@ -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 at python.org>
 
 

Modified: python/trunk/Doc/library/rexec.rst
==============================================================================
--- python/trunk/Doc/library/rexec.rst	(original)
+++ python/trunk/Doc/library/rexec.rst	Sat May 10 04:27:04 2008
@@ -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.

Modified: python/trunk/Lib/Bastion.py
==============================================================================
--- python/trunk/Lib/Bastion.py	(original)
+++ python/trunk/Lib/Bastion.py	Sat May 10 04:27:04 2008
@@ -25,6 +25,9 @@
 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"]
 

Modified: python/trunk/Lib/rexec.py
==============================================================================
--- python/trunk/Lib/rexec.py	(original)
+++ python/trunk/Lib/rexec.py	Sat May 10 04:27:04 2008
@@ -16,6 +16,9 @@
 - 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

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Sat May 10 04:27:04 2008
@@ -128,7 +128,8 @@
 
     # 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):