From 58682b7fe53d9bf7fefea59413d47ddd3c9a7d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 11 Aug 2001 15:02:57 +0000 Subject: Only catch the errors that can actually occur, as reported in bug #411881. --- Lib/types.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Lib/types.py') diff --git a/Lib/types.py b/Lib/types.py index 742b8cc5ff..01af463640 100644 --- a/Lib/types.py +++ b/Lib/types.py @@ -31,7 +31,8 @@ FunctionType = type(_f) LambdaType = type(lambda: None) # Same as FunctionType try: CodeType = type(_f.func_code) -except: +except RuntimeError: + # Execution in restricted environment pass def g(): @@ -54,7 +55,8 @@ ModuleType = type(sys) try: FileType = type(sys.__stdin__) -except: +except AttributeError: + # Not available in restricted mode pass XRangeType = type(xrange(0)) @@ -65,7 +67,9 @@ except TypeError: tb = sys.exc_info()[2] TracebackType = type(tb) FrameType = type(tb.tb_frame) - except: + except AttributeError: + # In the restricted environment, exc_info returns (None, None, + # None) Then, tb.tb_frame gives an attribute error pass tb = None; del tb -- cgit v1.2.1