summary refs log tree commit diff stats
path: root/scripts/qapi.py
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-08-27 12:08:51 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2014-08-28 13:42:25 +0100
commit7ac9a9d6e1fbc702dee8d2a2eb3151bc704104dc (patch)
tree1e7b3621a8fd7f692629980d2bfbad7037682f13 /scripts/qapi.py
parentc47c61be8dcd91689c8fc77776db924d684c3b39 (diff)
downloadfocaccia-qemu-7ac9a9d6e1fbc702dee8d2a2eb3151bc704104dc.tar.gz
focaccia-qemu-7ac9a9d6e1fbc702dee8d2a2eb3151bc704104dc.zip
qapi.py: avoid Python 2.5+ any() function
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>
Reviewed-by: BenoƮt Canet <benoit.canet@nodalink.com>
Diffstat (limited to 'scripts/qapi.py')
-rw-r--r--scripts/qapi.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py
index f2c6d1f840..77d46aa995 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