[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
From: |
Laurent Desnogues |
Subject: |
Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7 |
Date: |
Tue, 8 Sep 2015 07:17:27 +0200 |
On Mon, Sep 7, 2015 at 5:45 PM, Markus Armbruster <address@hidden> wrote:
> A feature new in Python 2.7 crept into commit 77e703b: re.subn()'s
> fifth argument. Avoid that, use re.compile().
>
> Reported-by: Laurent Desnogues <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
Tested-by: Laurent Desnogues <address@hidden>
Works fine here. Thanks,
Laurent
> ---
> scripts/qapi.py | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/qapi.py b/scripts/qapi.py
> index 817d824..88fa073 100644
> --- a/scripts/qapi.py
> +++ b/scripts/qapi.py
> @@ -944,7 +944,9 @@ def cgen(code, **kwds):
> raw = code % kwds
> if indent_level:
> indent = genindent(indent_level)
> - raw = re.subn("^.", indent + r'\g<0>', raw, 0, re.MULTILINE)
> + # re.subn() lacks flags support before Python 2.7, use re.compile()
> + raw = re.subn(re.compile("^.", re.MULTILINE),
> + indent + r'\g<0>', raw)
> raw = raw[0]
> return re.sub(re.escape(eatspace) + ' *', '', raw)