Only catch the errors that can actually occur, as reported in bug #411881.
diff --git a/Lib/types.py b/Lib/types.py
index 742b8cc..01af463 100644
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -31,7 +31,8 @@
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 @@
try:
FileType = type(sys.__stdin__)
-except:
+except AttributeError:
+ # Not available in restricted mode
pass
XRangeType = type(xrange(0))
@@ -65,7 +67,9 @@
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