From 2752e5bedb26fa0c7291f810f9f534b688b2f1d2 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 7 Sep 2015 17:45:55 +0200 Subject: [PATCH] qapi: Fix cgen() for Python older than 2.7 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 Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Tested-by: Laurent Desnogues Message-id: 1441640755-23902-1-git-send-email-armbru@redhat.com Signed-off-by: Peter Maydell --- scripts/qapi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 817d824bea..88fa073184 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) -- GitLab