diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-19 21:43:13 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-19 21:43:13 +0000 |
| commit | 3a30bda9a6a537ee45cfafaaf772e84bd28df35a (patch) | |
| tree | d047a7f5354ef69e5a229bc973c4e89d32d0d229 /libstdc++-v3 | |
| parent | 3c688d2db432b0c4709370ea3668c35ddd02ae53 (diff) | |
| download | gcc-3a30bda9a6a537ee45cfafaaf772e84bd28df35a.tar.gz | |
* python/libstdcxx/v6/printers.py: Use Python3 raise syntax.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210625 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/printers.py | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 429b1683096..0b2bf8924df 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2014-05-19 Jonathan Wakely <jwakely@redhat.com> + + * python/libstdcxx/v6/printers.py: Use Python3 raise syntax. + 2014-05-17 Marc Glisse <marc.glisse@inria.fr> * libsupc++/new_op.cc: Factor the calls to malloc, use __builtin_expect. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 1f1f860a5b0..623a815cb89 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -51,7 +51,7 @@ def find_type(orig, name): # anything fancier here. field = typ.fields()[0] if not field.is_base_class: - raise ValueError, "Cannot find type %s::%s" % (str(orig), name) + raise ValueError("Cannot find type %s::%s" % (str(orig), name)) typ = field.type class SharedPointerPrinter: @@ -276,7 +276,7 @@ class StdTuplePrinter: # Set the actual head to the first pair. self.head = self.head.cast (nodes[0].type) elif len (nodes) != 0: - raise ValueError, "Top of tuple tree does not consist of a single node." + raise ValueError("Top of tuple tree does not consist of a single node.") self.count = 0 def __iter__ (self): @@ -289,7 +289,7 @@ class StdTuplePrinter: raise StopIteration # Check that this iteration has an expected structure. if len (nodes) != 2: - raise ValueError, "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. @@ -389,7 +389,7 @@ def get_value_from_Rb_tree_node(node): return p.dereference() except: pass - raise ValueError, "Unsupported implementation for %s" % str(node.type) + raise ValueError("Unsupported implementation for %s" % str(node.type)) # This is a pretty printer for std::_Rb_tree_iterator (which is # std::map::iterator), and has nothing to do with the RbtreeIterator @@ -827,7 +827,7 @@ class Printer(object): # A small sanity check. # FIXME if not self.compiled_rx.match(name + '<>'): - raise ValueError, 'libstdc++ programming error: "%s" does not match' % name + raise ValueError('libstdc++ programming error: "%s" does not match' % name) printer = RxPrinter(name, function) self.subprinters.append(printer) self.lookup[name] = printer |