[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 10/36] qapi/common.py: Remove python compatibility workaround
From: |
John Snow |
Subject: |
[PATCH v6 10/36] qapi/common.py: Remove python compatibility workaround |
Date: |
Fri, 9 Oct 2020 12:15:32 -0400 |
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
---
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 ba35abea478..cee63eb95c7 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.sub(r'^(?!(#|$))', indent, raw, flags=re.MULTILINE)
return re.sub(re.escape(eatspace) + r' *', '', raw)
--
2.26.2
- [PATCH v6 03/36] qapi-gen: Separate arg-parsing from generation, (continued)
- [PATCH v6 04/36] qapi: move generator entrypoint into package, John Snow, 2020/10/09
- [PATCH v6 08/36] qapi: delint using flake8, John Snow, 2020/10/09
- [PATCH v6 06/36] qapi: Remove wildcard includes, John Snow, 2020/10/09
- [PATCH v6 05/36] qapi: Prefer explicit relative imports, John Snow, 2020/10/09
- [PATCH v6 07/36] qapi: enforce import order/styling with isort, John Snow, 2020/10/09
- [PATCH v6 09/36] qapi: add pylintrc, John Snow, 2020/10/09
- [PATCH v6 10/36] qapi/common.py: Remove python compatibility workaround,
John Snow <=
- [PATCH v6 11/36] qapi/common.py: Add indent manager, John Snow, 2020/10/09
- [PATCH v6 12/36] qapi/common.py: delint with pylint, John Snow, 2020/10/09
- [PATCH v6 13/36] qapi/common.py: Replace one-letter 'c' variable, John Snow, 2020/10/09
- [PATCH v6 15/36] qapi/common.py: add type hint annotations, John Snow, 2020/10/09
- [PATCH v6 20/36] qapi/events.py: Move comments into docstrings, John Snow, 2020/10/09
- [PATCH v6 16/36] qapi/common.py: Convert comments into docstrings, and elaborate, John Snow, 2020/10/09
- [PATCH v6 14/36] qapi/common.py: check with pylint, John Snow, 2020/10/09
- [PATCH v6 17/36] qapi/common.py: move build_params into gen.py, John Snow, 2020/10/09
- [PATCH v6 19/36] qapi/events.py: add type hint annotations, John Snow, 2020/10/09
- [PATCH v6 18/36] qapi: establish mypy type-checking baseline, John Snow, 2020/10/09