2013-10-02 Phil Muldoon <pmuldoon@redhat.com>

	* python/lib/gdb/command/frame_filters.py
	(InfoFrameFilter.list_frame_filters): Retrieve exception manually.
	(ShowFrameFilterPriority.invoke): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9f19d9ed254b9cf36a1d01151e7965bea4e59337..22a227136049e30d6f11cc1628ecc360d0414308 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-02  Phil Muldoon  <pmuldoon@redhat.com>
+
+       * python/lib/gdb/command/frame_filters.py
+       (InfoFrameFilter.list_frame_filters): Retrieve exception manually.
+       (ShowFrameFilterPriority.invoke): Ditto.
+
 2013-10-01  Keith Seitz  <keiths@redhat.com>
 
        * linespec.c (struct ls_parser): Make 'saved_arg' const.

diff --git a/gdb/python/lib/gdb/command/frame_filters.py b/gdb/python/lib/gdb/command/frame_filters.py
index b5d34ade3db89deb319e1a4d07f416ddeae27d06..b04f47791622f262f7504fadc50750d69b9c1701 100644 (file)
--- a/gdb/python/lib/gdb/command/frame_filters.py
+++ b/gdb/python/lib/gdb/command/frame_filters.py
@@ -16,6 +16,7 @@
 
 """GDB commands for working with frame-filters."""
 
+import sys
 import gdb
 import copy
 from gdb.FrameIterator import FrameIterator
@@ -79,7 +80,8 @@ class InfoFrameFilter(gdb.Command):
                         str(gdb.frames.get_priority(frame_filter[1])))
                     enabled = '{:<7}'.format(
                         self.enabled_string(gdb.frames.get_enabled(frame_filter[1])))
-                except Exception as e:
+                except Exception:
+                    e = sys.exc_info()[1]
                     print("  Error printing filter '"+name+"': "+str(e))
                 else:
                     print("  %s  %s  %s" % (priority, enabled, name))
@@ -448,7 +450,8 @@ class ShowFrameFilterPriority(gdb.Command):
         list_name = command_tuple[0]
         try:
             priority = self.get_filter_priority(list_name, filter_name);
-        except Exception as e:
+        except Exception:
+            e = sys.exc_info()[1]
             print("Error printing filter priority for '"+name+"':"+str(e))
         else:
             print("Priority of filter '" + filter_name + "' in list '" \