commit cc54622651fe95c0bcb163262885a41cfdbbc615
author Benjamin Peterson <benjamin@python.org> Fri Aug 28 16:49:56 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Fri Aug 28 16:49:56 2009 +0000
tree 98f5d786c96051d145e2bef3835f06bbee3eafc9
parent f6348f45899090f63e534d6772c98c67693bb774

remove more code for restricted execution

Lib/types.py

diff --git a/Lib/types.py b/Lib/types.py
index 39ad488..ff90e04 100644
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -66,15 +66,10 @@
 try:
     raise TypeError
 except TypeError:
-    try:
-        tb = sys.exc_info()[2]
-        TracebackType = type(tb)
-        FrameType = type(tb.tb_frame)
-    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
+    tb = sys.exc_info()[2]
+    TracebackType = type(tb)
+    FrameType = type(tb.tb_frame)
+    del tb
 
 SliceType = slice
 EllipsisType = type(Ellipsis)