Re: [PATCH 08/37] qapi/common.py: Remove python compatibility workaround

2020-09-16 Thread John Snow 

On 9/16/20 8:34 AM, Markus Armbruster wrote:

John Snow  writes:


Signed-off-by: John Snow 
---
  scripts/qapi/common.py | 5 +
  1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index ba35abea47..4fb265a8bf 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -119,10 +119,7 @@ def cgen(code, **kwds):
  raw = code % kwds
  if indent_level:
  indent = genindent(indent_level)
-# re.subn() lacks flags support before Python 2.7, use re.compile()
-raw = re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE),
-  indent, raw)
-raw = raw[0]
+raw, _ = re.subn(r'^(?!(#|$))', indent, raw, flags=re.MULTILINE)
  return re.sub(re.escape(eatspace) + r' *', '', raw)


I missed this one in my "qapi: Bye-bye Python 2" series.

Can we use re.sub() instead?



Yup.

Re: [PATCH 08/37] qapi/common.py: Remove python compatibility workaround

2020-09-16 Thread Markus Armbruster 
John Snow  writes:

> Signed-off-by: John Snow 
> ---
>  scripts/qapi/common.py | 5 +
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index ba35abea47..4fb265a8bf 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -119,10 +119,7 @@ def cgen(code, **kwds):
>  raw = code % kwds
>  if indent_level:
>  indent = genindent(indent_level)
> -# re.subn() lacks flags support before Python 2.7, use re.compile()
> -raw = re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE),
> -  indent, raw)
> -raw = raw[0]
> +raw, _ = re.subn(r'^(?!(#|$))', indent, raw, flags=re.MULTILINE)
>  return re.sub(re.escape(eatspace) + r' *', '', raw)

I missed this one in my "qapi: Bye-bye Python 2" series.

Can we use re.sub() instead?

[PATCH 08/37] qapi/common.py: Remove python compatibility workaround

2020-09-15 Thread John Snow 
Signed-off-by: John Snow 
---
 scripts/qapi/common.py | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index ba35abea47..4fb265a8bf 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -119,10 +119,7 @@ def cgen(code, **kwds):
 raw = code % kwds
 if indent_level:
 indent = genindent(indent_level)
-# re.subn() lacks flags support before Python 2.7, use re.compile()
-raw = re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE),
-  indent, raw)
-raw = raw[0]
+raw, _ = re.subn(r'^(?!(#|$))', indent, raw, flags=re.MULTILINE)
 return re.sub(re.escape(eatspace) + r' *', '', raw)
 
 
-- 
2.26.2