]> xenbits.xensource.com Git - qemu-xen-unstable.git/commitdiff
qapi.py: avoid Python 2.5+ any() function
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 27 Aug 2014 11:08:51 +0000 (12:08 +0100)
committerStefan Hajnoczi <stefanha@redhat.com>
Thu, 28 Aug 2014 12:42:25 +0000 (13:42 +0100)
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>
scripts/qapi.py

index f2c6d1f840a4de93de976a720e81ee0ced1e0436..77d46aa99593eeef901c31369285ee10f6850a2d 100644 (file)
@@ -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