Commit 47059228 by Jonathan Wakely Committed by Jonathan Wakely

* python/libstdcxx/v6/printers.py: Use Python3 raise syntax.

From-SVN: r210625
parent 0f5b0135
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> 2014-05-17 Marc Glisse <marc.glisse@inria.fr>
* libsupc++/new_op.cc: Factor the calls to malloc, use __builtin_expect. * libsupc++/new_op.cc: Factor the calls to malloc, use __builtin_expect.
......
...@@ -51,7 +51,7 @@ def find_type(orig, name): ...@@ -51,7 +51,7 @@ def find_type(orig, name):
# anything fancier here. # anything fancier here.
field = typ.fields()[0] field = typ.fields()[0]
if not field.is_base_class: 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 typ = field.type
class SharedPointerPrinter: class SharedPointerPrinter:
...@@ -276,7 +276,7 @@ class StdTuplePrinter: ...@@ -276,7 +276,7 @@ class StdTuplePrinter:
# Set the actual head to the first pair. # Set the actual head to the first pair.
self.head = self.head.cast (nodes[0].type) self.head = self.head.cast (nodes[0].type)
elif len (nodes) != 0: 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 self.count = 0
def __iter__ (self): def __iter__ (self):
...@@ -289,7 +289,7 @@ class StdTuplePrinter: ...@@ -289,7 +289,7 @@ class StdTuplePrinter:
raise StopIteration raise StopIteration
# Check that this iteration has an expected structure. # Check that this iteration has an expected structure.
if len (nodes) != 2: 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. # - Left node is the next recursion parent.
# - Right node is the actual class contained in the tuple. # - Right node is the actual class contained in the tuple.
...@@ -389,7 +389,7 @@ def get_value_from_Rb_tree_node(node): ...@@ -389,7 +389,7 @@ def get_value_from_Rb_tree_node(node):
return p.dereference() return p.dereference()
except: except:
pass 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 # This is a pretty printer for std::_Rb_tree_iterator (which is
# std::map::iterator), and has nothing to do with the RbtreeIterator # std::map::iterator), and has nothing to do with the RbtreeIterator
...@@ -827,7 +827,7 @@ class Printer(object): ...@@ -827,7 +827,7 @@ class Printer(object):
# A small sanity check. # A small sanity check.
# FIXME # FIXME
if not self.compiled_rx.match(name + '<>'): 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) printer = RxPrinter(name, function)
self.subprinters.append(printer) self.subprinters.append(printer)
self.lookup[name] = printer self.lookup[name] = printer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment