[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 14/46] qapi/common.py: Remove python compatibility workaround
From: |
John Snow |
Subject: |
[PATCH v4 14/46] qapi/common.py: Remove python compatibility workaround |
Date: |
Wed, 30 Sep 2020 00:31:18 -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 v4 01/46] [DO-NOT-MERGE] docs: replace single backtick (`) with double-backtick (``), (continued)
- [PATCH v4 01/46] [DO-NOT-MERGE] docs: replace single backtick (`) with double-backtick (``), John Snow, 2020/09/30
- [PATCH v4 05/46] [DO-NOT-MERGE] docs: enable sphinx-autodoc for scripts/qapi, John Snow, 2020/09/30
- [PATCH v4 07/46] qapi: move generator entrypoint into module, John Snow, 2020/09/30
- [PATCH v4 09/46] qapi: Prefer explicit relative imports, John Snow, 2020/09/30
- [PATCH v4 06/46] qapi-gen: Separate arg-parsing from generation, John Snow, 2020/09/30
- [PATCH v4 08/46] [DO-NOT-MERGE] docs: add scripts/qapi/main to python manual, John Snow, 2020/09/30
- [PATCH v4 11/46] qapi: enforce import order/styling with isort, John Snow, 2020/09/30
- [PATCH v4 10/46] qapi: Remove wildcard includes, John Snow, 2020/09/30
- [PATCH v4 12/46] qapi: delint using flake8, John Snow, 2020/09/30
- [PATCH v4 13/46] qapi: add pylintrc, John Snow, 2020/09/30
- [PATCH v4 14/46] qapi/common.py: Remove python compatibility workaround,
John Snow <=
- [PATCH v4 15/46] qapi/common.py: Add indent manager, John Snow, 2020/09/30
- [PATCH v4 16/46] qapi/common.py: delint with pylint, John Snow, 2020/09/30
- [PATCH v4 17/46] qapi/common.py: Replace one-letter 'c' variable, John Snow, 2020/09/30
- [PATCH v4 19/46] qapi/common.py: add type hint annotations, John Snow, 2020/09/30
- [PATCH v4 18/46] qapi/common.py: check with pylint, John Snow, 2020/09/30
- [PATCH v4 20/46] qapi/common.py: Convert comments into docstrings, and elaborate, John Snow, 2020/09/30
- [PATCH v4 25/46] qapi/commands.py: Don't re-bind to variable of different type, John Snow, 2020/09/30
- [PATCH v4 28/46] qapi/source.py: add type hint annotations, John Snow, 2020/09/30
- [PATCH v4 31/46] qapi/gen.py: add type hint annotations, John Snow, 2020/09/30
- [PATCH v4 21/46] qapi/common.py: move build_params into gen.py, John Snow, 2020/09/30