Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

On 09/07/2015 09:45 AM, Markus Armbruster 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 <laurent.desnogues@gmail.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  scripts/qapi.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> 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)
>  
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]