* Make the libstdc++ pretty printers compatible with Python3, if

    gdb is built with Python3 support.


git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6978 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

1 files changed, 167 insertions, 0 deletions

diff --git a/debian/patches/libstdc++-python3.diff b/debian/patches/libstdc++-python3.diff
new file mode 100644
index 0000000..38ffb7d
--- /dev/null
+++ b/debian/patches/libstdc++-python3.diff
@@ -0,0 +1,167 @@
+# DP: Make the libstdc++-v3 pretty printer compatible with Python3.
+
+--- a/src/libstdc++-v3/python/libstdcxx/v6/printers.py
++++ b/src/libstdc++-v3/python/libstdcxx/v6/printers.py
+@@ -51,7 +51,7 @@
+         # 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:
+@@ -97,7 +97,7 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
++        def __next__(self):
+             if self.base == self.head:
+                 raise StopIteration
+             elt = self.base.cast(self.nodetype).dereference()
+@@ -144,7 +144,7 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
++        def __next__(self):
+             if self.base == 0:
+                 raise StopIteration
+             elt = self.base.cast(self.nodetype).dereference()
+@@ -198,7 +198,7 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
++        def __next__(self):
+             count = self.count
+             self.count = self.count + 1
+             if self.bitvec:
+@@ -276,20 +276,20 @@
+                 # 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):
+             return self
+ 
+-        def next (self):
++        def __next__ (self):
+             nodes = self.head.type.fields ()
+             # Check for further recursions in the inheritance tree.
+             if len (nodes) == 0:
+                 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.
+@@ -353,7 +353,7 @@
+     def __len__(self):
+         return int (self.size)
+ 
+-    def next(self):
++    def __next__(self):
+         if self.count == self.size:
+             raise StopIteration
+         result = self.node
+@@ -414,9 +414,9 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
++        def __next__(self):
+             if self.count % 2 == 0:
+-                n = self.rbiter.next()
++                n = next(self.rbiter)
+                 n = n.cast(self.type).dereference()['_M_value_field']
+                 self.pair = n
+                 item = n['first']
+@@ -456,8 +456,8 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
+-            item = self.rbiter.next()
++        def __next__(self):
++            item = next(self.rbiter)
+             item = item.cast(self.type).dereference()['_M_value_field']
+             # FIXME: this is weird ... what to do?
+             # Maybe a 'set' display hint?
+@@ -534,7 +534,7 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
++        def __next__(self):
+             if self.p == self.last:
+                 raise StopIteration
+ 
+@@ -572,7 +572,7 @@
+ 
+         size = self.buffer_size * delta_n + delta_s + delta_e
+ 
+-        return '%s with %d elements' % (self.typename, long (size))
++        return '%s with %d elements' % (self.typename, int (size))
+ 
+     def children(self):
+         start = self.val['_M_impl']['_M_start']
+@@ -627,7 +627,7 @@
+     def __iter__ (self):
+         return self
+ 
+-    def next (self):
++    def __next__ (self):
+         if self.node == 0:
+             raise StopIteration
+         node = self.node.cast(self.node_type)
+@@ -655,8 +655,8 @@
+         return '[%d]' % i
+ 
+     def children (self):
+-        counter = itertools.imap (self.format_count, itertools.count())
+-        return itertools.izip (counter, Tr1HashtableIterator (self.hashtable()))
++        counter = map (self.format_count, itertools.count())
++        return zip (counter, Tr1HashtableIterator (self.hashtable()))
+ 
+ class Tr1UnorderedMapPrinter:
+     "Print a tr1::unordered_map"
+@@ -688,11 +688,11 @@
+         return '[%d]' % i
+ 
+     def children (self):
+-        counter = itertools.imap (self.format_count, itertools.count())
++        counter = map (self.format_count, itertools.count())
+         # Map over the hash table and flatten the result.
+-        data = self.flatten (itertools.imap (self.format_one, Tr1HashtableIterator (self.hashtable())))
++        data = self.flatten (map (self.format_one, Tr1HashtableIterator (self.hashtable())))
+         # Zip the two iterators together.
+-        return itertools.izip (counter, data)
++        return zip (counter, data)
+ 
+     def display_hint (self):
+         return 'map'
+@@ -709,7 +709,7 @@
+         def __iter__(self):
+             return self
+ 
+-        def next(self):
++        def __next__(self):
+             if self.base == 0:
+                 raise StopIteration
+             elt = self.base.cast(self.nodetype).dereference()
+@@ -764,7 +764,7 @@
+         # 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