From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMz4G-0004AG-VC for qemu-devel@nongnu.org; Thu, 28 Aug 2014 08:44:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMz4B-0008BH-PQ for qemu-devel@nongnu.org; Thu, 28 Aug 2014 08:44:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMz4B-0008BA-I6 for qemu-devel@nongnu.org; Thu, 28 Aug 2014 08:44:39 -0400 From: Stefan Hajnoczi Date: Thu, 28 Aug 2014 13:44:22 +0100 Message-Id: <1409229867-16775-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1409229867-16775-1-git-send-email-stefanha@redhat.com> References: <1409229867-16775-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 1/6] qapi.py: avoid Python 2.5+ any() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi There is one instance of any() in qapi.py that breaks builds on older distros that ship Python 2.4 (like RHEL5): GEN qmp-commands.h Traceback (most recent call last): File "build/scripts/qapi-commands.py", line 445, in ? exprs = parse_schema(input_file) File "build/scripts/qapi.py", line 329, in parse_schema schema = QAPISchema(open(input_file, "r")) File "build/scripts/qapi.py", line 110, in __init__ if any(include_path == elem[1] NameError: global name 'any' is not defined Signed-off-by: Stefan Hajnoczi --- scripts/qapi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 = os.path.join(self.input_dir, include) - if any(include_path == 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 == 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 -- 1.9.3