From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Andreas Faerber <afaerber@suse.de>
Subject: [Qemu-devel] [PATCH 1/2] qapi.py: avoid Python 2.5+ any() function
Date: Tue, 12 Aug 2014 13:37:33 +0100 [thread overview]
Message-ID: <1407847054-672-2-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1407847054-672-1-git-send-email-stefanha@redhat.com>
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 <stefanha@redhat.com>
---
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
next prev parent reply other threads:[~2014-08-12 12:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-12 12:37 [Qemu-devel] [PATCH 0/2] Fixes for buildbot failures Stefan Hajnoczi
2014-08-12 12:37 ` Stefan Hajnoczi [this message]
2014-08-15 7:43 ` [Qemu-devel] [PATCH 1/2] qapi.py: avoid Python 2.5+ any() function Riku Voipio
2014-08-27 9:05 ` Stefan Hajnoczi
2014-08-27 11:01 ` Stefan Hajnoczi
2014-08-12 12:37 ` [Qemu-devel] [PATCH 2/2] libqtest: launch QEMU with QEMU_AUDIO_DRV=none Stefan Hajnoczi
2014-08-12 12:57 ` Markus Armbruster
2014-08-12 13:20 ` Andreas Färber
2014-08-15 12:08 ` Peter Maydell
2014-08-15 15:12 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407847054-672-2-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=afaerber@suse.de \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).