[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 1/6] qapi.py: avoid Python 2.5+ any() functio
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCH v2 1/6] qapi.py: avoid Python 2.5+ any() function |
Date: |
Wed, 27 Aug 2014 16:15:01 +0200 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
The Wednesday 27 Aug 2014 à 12:08:51 (+0100), Stefan Hajnoczi wrote :
> 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 <address@hidden>
> ---
> 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
>
>
Reviewed-by: Benoît Canet <address@hidden>
- [Qemu-devel] [PATCH v2 0/6] Fixes for buildbot failures, Stefan Hajnoczi, 2014/08/27
- [Qemu-devel] [PATCH v2 1/6] qapi.py: avoid Python 2.5+ any() function, Stefan Hajnoczi, 2014/08/27
- Re: [Qemu-devel] [PATCH v2 1/6] qapi.py: avoid Python 2.5+ any() function,
Benoît Canet <=
- [Qemu-devel] [PATCH v2 2/6] libqtest: launch QEMU with QEMU_AUDIO_DRV=none, Stefan Hajnoczi, 2014/08/27
- [Qemu-devel] [PATCH v2 3/6] trace: avoid Python 2.5 all() in tracetool, Stefan Hajnoczi, 2014/08/27
- [Qemu-devel] [PATCH v2 4/6] mirror: fix uninitialized variable delay_ns warnings, Stefan Hajnoczi, 2014/08/27
- [Qemu-devel] [PATCH v2 5/6] block: sort formats alphabetically in bdrv_iterate_format(), Stefan Hajnoczi, 2014/08/27
- [Qemu-devel] [PATCH v2 6/6] Revert "qemu-img: sort block formats in help message", Stefan Hajnoczi, 2014/08/27