mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi.py: avoid Python 2.5+ any() function

Browse Source 
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>
This commit is contained in:
Stefan Hajnoczi 2014-08-27 12:08:51 +01:00
parent c47c61be8d
commit 7ac9a9d6e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/qapi.py
View File

@ -107,10 +107,10 @@ class QAPISchema:
'Expected a file name (string), got: %s' 'Expected a file name (string), got: %s'
% include) % include)
include_path = os.path.join(self.input_dir, include) include_path = os.path.join(self.input_dir, include)
if any(include_path == elem[1] for elem in self.include_hist:
for elem in self.include_hist): if include_path == elem[1]:
raise QAPIExprError(expr_info, "Inclusion loop for %s" raise QAPIExprError(expr_info, "Inclusion loop for %s"
% include) % include)
# skip multiple include of the same file # skip multiple include of the same file
if include_path in previously_included: if include_path in previously_included:
continue continue