From: Guido van Rossum <guido@python.org>
Date: Tue, 20 Aug 1996 20:25:08 +0000 (+0000)
Subject: delattr() can raise AttributeError, not KeyError.
X-Git-Tag: v1.4b3~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63f0cf084077bdfe165a899175deca24a0f783e5;p=thirdparty%2FPython%2Fcpython.git

delattr() can raise AttributeError, not KeyError.
Use keyword arg to set verbose flag in test func.
---

diff --git a/Lib/rexec.py b/Lib/rexec.py
index 3f34153a9b98..860aab2456f8 100644
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -229,7 +229,7 @@ class RExec(ihooks._Verbose):
 	for name in exceptions:
 	    try:
 		delattr(dst, name)
-	    except KeyError:
+	    except AttributeError:
 		pass
 	return dst
 
@@ -356,7 +356,7 @@ class RExec(ihooks._Verbose):
 
 def test():
     import traceback
-    r = RExec(None, '-v' in sys.argv[1:])
+    r = RExec(verbose=('-v' in sys.argv[1:]))
     print "*** RESTRICTED *** Python", sys.version
     print sys.copyright
     while 1: