b935d25
--- a/Tools/gdb/libpython.py	2013-04-06 03:41:58.000000000 -0400
b935d25
+++ b/Tools/gdb/libpython.py	2013-04-24 03:51:04.720540343 -0400
b935d25
@@ -274,6 +274,9 @@
b935d25
                 self.tp_name = tp_name
b935d25
                 self.address = address
b935d25
 
b935d25
+            def __len__(self):
b935d25
+                return len(repr(self))
b935d25
+
b935d25
             def __repr__(self):
b935d25
                 # For the NULL pointer, we have no way of knowing a type, so
b935d25
                 # special-case it as per
b935d25
@@ -881,6 +884,8 @@
b935d25
         filename = self.filename()
b935d25
         try:
b935d25
             f = open(os_fsencode(filename), 'r')
b935d25
+        except TypeError: # filename is FakeRepr
b935d25
+            return None
b935d25
         except IOError:
b935d25
             return None
b935d25
         with f:
b935d25
@@ -1523,9 +1528,12 @@
b935d25
 
b935d25
     def print_summary(self):
b935d25
         if self.is_evalframeex():
b935d25
-            pyop = self.get_pyop()
b935d25
-            if pyop:
b935d25
+            try:
b935d25
+                pyop = self.get_pyop()
b935d25
                 line = pyop.get_truncated_repr(MAX_OUTPUT_LEN)
b935d25
+            except:
b935d25
+                pyop = None
b935d25
+            if pyop:
b935d25
                 write_unicode(sys.stdout, '#%i %s\n' % (self.get_index(), line))
b935d25
                 if not pyop.is_optimized_out():
b935d25
                     line = pyop.current_line()
b935d25
@@ -1542,7 +1550,10 @@
b935d25
 
b935d25
     def print_traceback(self):
b935d25
         if self.is_evalframeex():
b935d25
-            pyop = self.get_pyop()
b935d25
+            try:
b935d25
+                pyop = self.get_pyop()
b935d25
+            except:
b935d25
+                pyop = None
b935d25
             if pyop:
b935d25
                 pyop.print_traceback()
b935d25
                 if not pyop.is_optimized_out():