From 3e5eda5b4d6675006fb6aa6e9daf62b5f07df57b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 29 Jul 2014 22:35:57 +0100 Subject: [PATCH] * python/libstdcxx/v6/printers.py (SingleObjContainerPrinter._contained): Use compatibility mixin. From-SVN: r213227 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/python/libstdcxx/v6/printers.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c818e63756d..1ccb4634274 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-07-29 Jonathan Wakely + + * python/libstdcxx/v6/printers.py + (SingleObjContainerPrinter._contained): Use compatibility mixin. + 2014-07-29 François Dumont * testsuite/util/testsuite_allocator.h diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 15d7a88dbf8..2e5cd6ca0a8 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -851,14 +851,14 @@ class SingleObjContainerPrinter(object): return gdb.types.apply_type_recognizers(gdb.types.get_type_recognizers(), type) or str(type) - class _contained: + class _contained(Iterator): def __init__ (self, val): self.val = val def __iter__ (self): return self - def next (self): + def __next__(self): if self.val is None: raise StopIteration retval = self.val