Backport r54787 - better error messages in rexec and bastion

diff --git a/Lib/Bastion.py b/Lib/Bastion.py
index 58cce978ce39095b6550ede7b6ec9ae477c28d4c..93511b0a948513f989006f6e1e0c4387ab266c1c 100644 (file)
--- a/Lib/Bastion.py
+++ b/Lib/Bastion.py
@@ -97,7 +97,7 @@ def Bastion(object, filter = lambda name: name[:1] != '_',
 
     """
 
-    raise RuntimeError, "This code is not secure in Python 2.2 and 2.3"
+    raise RuntimeError, "This code is not secure in Python 2.2 and later"
 
     # Note: we define *two* ad-hoc functions here, get1 and get2.
     # Both are intended to be called in the same way: get(name).

diff --git a/Lib/rexec.py b/Lib/rexec.py
index d289d6aa1e9608f8e73f4a928febece73d71f75b..8c9cb9f1e59a4c40cf5e024be2d57ab01bc0b7f9 100644 (file)
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -181,7 +181,7 @@ class RExec(ihooks._Verbose):
 
         """
 
-        raise RuntimeError, "This code is not secure in Python 2.2 and 2.3"
+        raise RuntimeError, "This code is not secure in Python 2.2 and later"
 
         ihooks._Verbose.__init__(self, verbose)
         # XXX There's a circular reference here: