From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24721 invoked by alias); 29 Jul 2014 21:33:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 24704 invoked by uid 89); 29 Jul 2014 21:33:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 29 Jul 2014 21:33:57 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6TLXuGT025793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Jul 2014 17:33:56 -0400 Received: from localhost (ovpn-116-94.ams2.redhat.com [10.36.116.94]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6TLXtgs021399; Tue, 29 Jul 2014 17:33:55 -0400 Date: Tue, 29 Jul 2014 21:34:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: =?iso-8859-1?Q?Fran=E7ois?= Dumont , Paolo Carlini Subject: Re: testsuite allocators patch Message-ID: <20140729213354.GA2361@redhat.com> References: <53AC8678.5060706@gmail.com> <53AC8ED5.3070000@oracle.com> <20140626223858.GK2711@redhat.com> <53AD1CCC.2010309@oracle.com> <53ADCA79.2090007@oracle.com> <53D01C0B.2030203@gmail.com> <20140724085538.GS2361@redhat.com> <53D16880.8060904@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="qVHblb/y9DPlgkHs" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2014-07/txt/msg02015.txt.bz2 --qVHblb/y9DPlgkHs Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-length: 571 On 25/07/14 00:19 +0100, Jonathan Wakely wrote: >On 24 July 2014 21:11, François Dumont wrote: >> >> Yes I have tested with no other changes in my tree and got only those pretty >> printers errors which are unrelated I think: >> >> Python Exception iter() returned non-iterator of type >> '_contained': >> $2 = std::experimental::optional [no contained value] > >I haven't seen these, I'll fix them on Monday, thanks. Fixed by the attached patch. Tested x86_64-linux (thanks to Samual Bronson for testing with Python3) and committed to trunk. --qVHblb/y9DPlgkHs Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 1031 commit 7de83299c42041611360a1426f5164270ac6c6b6 Author: Jonathan Wakely Date: Tue Jul 29 20:08:31 2014 +0100 * python/libstdcxx/v6/printers.py (SingleObjContainerPrinter._contained): Use compatibility mixin. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 15d7a88..2e5cd6c 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 --qVHblb/y9DPlgkHs--