From cc54622651fe95c0bcb163262885a41cfdbbc615 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 28 Aug 2009 16:49:56 +0000
Subject: remove more code for restricted execution

---
 Lib/types.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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 @@ XRangeType = xrange
 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)
-- 
cgit v0.12