From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHBKn-0002Ud-VG for qemu-devel@nongnu.org; Tue, 12 Aug 2014 08:37:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHBKh-0003Gn-Og for qemu-devel@nongnu.org; Tue, 12 Aug 2014 08:37:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHBKh-0003Gj-GK for qemu-devel@nongnu.org; Tue, 12 Aug 2014 08:37:43 -0400 From: Stefan Hajnoczi Date: Tue, 12 Aug 2014 13:37:33 +0100 Message-Id: <1407847054-672-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1407847054-672-1-git-send-email-stefanha@redhat.com> References: <1407847054-672-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] 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: Markus Armbruster , Stefan Hajnoczi , Andreas Faerber 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