[Python-checkins] r74570 - python/trunk/Lib/types.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Aug 28 18:49:56 2009
New Revision: 74570

Log:
remove more code for restricted execution

Modified:
   python/trunk/Lib/types.py

Modified: python/trunk/Lib/types.py
==============================================================================
--- python/trunk/Lib/types.py	(original)
+++ python/trunk/Lib/types.py	Fri Aug 28 18:49:56 2009
@@ -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)