* [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
@ 2015-09-07 15:45 Markus Armbruster
2015-09-08 2:55 ` Eric Blake
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Markus Armbruster @ 2015-09-07 15:45 UTC (permalink / raw)
To: qemu-devel; +Cc: laurent.desnogues, mdroth
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(-)
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)
--
2.4.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
2015-09-07 15:45 [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7 Markus Armbruster
@ 2015-09-08 2:55 ` Eric Blake
2015-09-08 5:17 ` Laurent Desnogues
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Eric Blake @ 2015-09-08 2:55 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: laurent.desnogues, mdroth
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
2015-09-07 15:45 [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7 Markus Armbruster
2015-09-08 2:55 ` Eric Blake
@ 2015-09-08 5:17 ` Laurent Desnogues
2015-09-08 6:38 ` Markus Armbruster
2015-09-08 8:20 ` Peter Maydell
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Desnogues @ 2015-09-08 5:17 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, Michael Roth
On Mon, Sep 7, 2015 at 5:45 PM, Markus Armbruster <armbru@redhat.com> 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>
Tested-by: Laurent Desnogues <laurent.desnogues@gmail.com>
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)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
2015-09-07 15:45 [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7 Markus Armbruster
2015-09-08 2:55 ` Eric Blake
2015-09-08 5:17 ` Laurent Desnogues
@ 2015-09-08 6:38 ` Markus Armbruster
2015-09-14 17:50 ` Peter Maydell
2015-09-08 8:20 ` Peter Maydell
3 siblings, 1 reply; 7+ messages in thread
From: Markus Armbruster @ 2015-09-08 6:38 UTC (permalink / raw)
To: Peter Maydell; +Cc: laurent.desnogues, qemu-devel, mdroth
Peter, are you willing to commit this directly as a build fix? Or would
you prefer a pull request?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
2015-09-07 15:45 [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7 Markus Armbruster
` (2 preceding siblings ...)
2015-09-08 6:38 ` Markus Armbruster
@ 2015-09-08 8:20 ` Peter Maydell
2015-09-08 8:43 ` Markus Armbruster
3 siblings, 1 reply; 7+ messages in thread
From: Peter Maydell @ 2015-09-08 8:20 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Laurent Desnogues, QEMU Developers, Michael Roth
On 7 September 2015 at 16:45, Markus Armbruster <armbru@redhat.com> 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>
Should we cc: stable on this?
thanks
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
2015-09-08 8:20 ` Peter Maydell
@ 2015-09-08 8:43 ` Markus Armbruster
0 siblings, 0 replies; 7+ messages in thread
From: Markus Armbruster @ 2015-09-08 8:43 UTC (permalink / raw)
To: Peter Maydell; +Cc: Laurent Desnogues, QEMU Developers, Michael Roth
Peter Maydell <peter.maydell@linaro.org> writes:
> On 7 September 2015 at 16:45, Markus Armbruster <armbru@redhat.com> 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>
>
> Should we cc: stable on this?
Not needed: commit 77e703b is not in any release, and not meant for
stable.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7
2015-09-08 6:38 ` Markus Armbruster
@ 2015-09-14 17:50 ` Peter Maydell
0 siblings, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2015-09-14 17:50 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Laurent Desnogues, QEMU Developers, Michael Roth
On 8 September 2015 at 07:38, Markus Armbruster <armbru@redhat.com> wrote:
> Peter, are you willing to commit this directly as a build fix? Or would
> you prefer a pull request?
Applied to master, thanks (sorry I missed this email earlier).
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-09-14 17:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-07 15:45 [Qemu-devel] [PATCH] qapi: Fix cgen() for Python older than 2.7 Markus Armbruster
2015-09-08 2:55 ` Eric Blake
2015-09-08 5:17 ` Laurent Desnogues
2015-09-08 6:38 ` Markus Armbruster
2015-09-14 17:50 ` Peter Maydell
2015-09-08 8:20 ` Peter Maydell
2015-09-08 8:43 ` Markus Armbruster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.