From 98b131eb9ab8b7dbcc93d5664f7ce26071161a41 Mon Sep 17 00:00:00 2001 From: Andras Varga Date: Thu, 15 Aug 2024 21:27:59 +0200 Subject: [PATCH] scripts: port typepar-to-typename to python3 --- _scripts/typepar-to-typename | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_scripts/typepar-to-typename b/_scripts/typepar-to-typename index c0edb553ea8..8aed8c2d965 100755 --- a/_scripts/typepar-to-typename +++ b/_scripts/typepar-to-typename @@ -30,7 +30,7 @@ for root, dirs, files in os.walk(rootPath): containsIf = re.search(r"(?s)if +" + typeParam + r" *!=", content) if not containsIf and typeParamValue=='default("")': - print "WARNING: ", filename, ": ", typeParam, " default value is empty but corresponding submodule is not conditional (or does not exist)" + print(f"WARNING: {filename}: {typeParam} default value is empty but corresponding submodule is not conditional (or does not exist)") # remove fooType parameter content = re.sub(r"(?s)( *)string +" + typeParam + r"\b.*?\n", "", content) @@ -41,7 +41,7 @@ for root, dirs, files in os.walk(rootPath): # replace 'if fooType!=""' with 'if typename!=""' content = re.sub(r"(?s)( like +\w+ +)if +" + typeParam + r' *!= *""', r'\1if typename!=""', content) - print filename, ": ", typeParam, " declaration: ", mm.group(0), ", default is >>", typeParamValue, "<<" + print(f"{filename}: {typeParam} declaration: {mm.group(0)}, default is >>{typeParamValue}<<") # replace assignments on inherited type parameters content = re.sub(r"(?m)^( +\w+)Type( *=)", r"\1.typename\2", content) @@ -65,7 +65,7 @@ for root, dirs, files in os.walk(rootPath): content = f.read() origContent = content for m in re.finditer(r"\.([a-zA-Z]+Type) *= *(.*?) *#.*", content): - print m.group(1), " ---> ", m.group(2) + print(m.group(1), "--->", m.group(2)) content = re.sub(r"(?m)\.([a-zA-Z]+)Type( *=.*?)$", r".\1.typename\2 #TODO autoconverted", content) if content != origContent: #print content