From b2e894b50a1953727cb77898cc618e06577c34d9 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 22 Jun 2010 22:09:07 +0000 Subject: [PATCH] printers.py: Don't use string exceptions. 2010-06-22 Matthias Klose * python/libstdcxx/v6/printers.py: Don't use string exceptions. From-SVN: r161233 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/python/libstdcxx/v6/printers.py | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c1f218daa9d..2fb2a7216ad 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2010-06-22 Matthias Klose + + * python/libstdcxx/v6/printers.py: Don't use string exceptions. + 2010-06-22 Paolo Carlini PR libstdc++/44630 diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index baa0824856b..0533deaf158 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import gdb +#import gdb import itertools import re @@ -77,6 +77,7 @@ class StdListPrinter: elif self.typename == "std::__debug::list": nodetype = gdb.lookup_type('std::__norm::_List_node<%s>' % itype).pointer() else: + #raise ValueError, "Cannot cast list node for list printer." raise "Cannot cast list node for list printer." return self._iterator(nodetype, self.val['_M_impl']['_M_node']) @@ -101,7 +102,7 @@ class StdListIteratorPrinter: elif self.typename == "std::__norm::_List_iterator" or self.typename == "std::__norm::_List_const_iterator": nodetype = gdb.lookup_type('std::__norm::_List_node<%s>' % itype).pointer() else: - raise "Cannot cast list node for list iterator printer." + raise ValueError, "Cannot cast list node for list iterator printer." return self.val['_M_node'].cast(nodetype).dereference()['_M_data'] class StdSlistPrinter: @@ -208,7 +209,7 @@ class StdTuplePrinter: # tuple. nodes = self.head.type.fields () if len (nodes) != 1: - raise "Top of tuple tree does not consist of a single node." + raise ValueError, "Top of tuple tree does not consist of a single node." # Set the actual head to the first pair. self.head = self.head.cast (nodes[0].type) @@ -224,7 +225,7 @@ class StdTuplePrinter: raise StopIteration # Check that this iteration has an expected structure. if len (nodes) != 2: - raise "Cannot parse more than 2 nodes in a tuple tree." + raise ValueError, "Cannot parse more than 2 nodes in a tuple tree." # - Left node is the next recursion parent. # - Right node is the actual class contained in the tuple.