From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMe10-00067x-Eb for qemu-devel@nongnu.org; Wed, 27 Aug 2014 10:16:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMe0r-0003cX-Am for qemu-devel@nongnu.org; Wed, 27 Aug 2014 10:15:58 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:38028 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMe0r-0003cK-2Y for qemu-devel@nongnu.org; Wed, 27 Aug 2014 10:15:49 -0400 Date: Wed, 27 Aug 2014 16:15:01 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140827141501.GB31176@irqsave.net> References: <1409137736-827-1-git-send-email-stefanha@redhat.com> <1409137736-827-2-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1409137736-827-2-git-send-email-stefanha@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/6] qapi.py: avoid Python 2.5+ any() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Peter Maydell , Riku Voipio , qemu-devel@nongnu.org, Markus Armbruster , Gerd Hoffmann , Andreas Faerber The Wednesday 27 Aug 2014 =E0 12:08:51 (+0100), Stefan Hajnoczi wrote : > There is one instance of any() in qapi.py that breaks builds on older > distros that ship Python 2.4 (like RHEL5): >=20 > GEN qmp-commands.h > Traceback (most recent call last): > File "build/scripts/qapi-commands.py", line 445, in ? > exprs =3D parse_schema(input_file) > File "build/scripts/qapi.py", line 329, in parse_schema > schema =3D QAPISchema(open(input_file, "r")) > File "build/scripts/qapi.py", line 110, in __init__ > if any(include_path =3D=3D elem[1] > NameError: global name 'any' is not defined >=20 > Signed-off-by: Stefan Hajnoczi > --- > scripts/qapi.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/scripts/qapi.py b/scripts/qapi.py > index f2c6d1f..77d46aa 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -107,10 +107,10 @@ class QAPISchema: > 'Expected a file name (string)= , got: %s' > % include) > include_path =3D os.path.join(self.input_dir, include) > - if any(include_path =3D=3D elem[1] > - for elem in self.include_hist): > - raise QAPIExprError(expr_info, "Inclusion loop for= %s" > - % include) > + for elem in self.include_hist: > + if include_path =3D=3D elem[1]: > + raise QAPIExprError(expr_info, "Inclusion loop= for %s" > + % include) > # skip multiple include of the same file > if include_path in previously_included: > continue > --=20 > 1.9.3 >=20 >=20 Reviewed-by: Beno=EEt Canet