From d3a458ef1ac463347f49e98b3198cb8964f028c0 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Tue, 8 Nov 2022 16:46:38 +0100 Subject: [PATCH] C#: Remove blank lines in generated converted models. --- misc/scripts/models-as-data/convert_extensions.py | 6 ++---- misc/scripts/models-as-data/helpers.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/misc/scripts/models-as-data/convert_extensions.py b/misc/scripts/models-as-data/convert_extensions.py index 1f98c769bdf..ff5d5ee6cd5 100644 --- a/misc/scripts/models-as-data/convert_extensions.py +++ b/misc/scripts/models-as-data/convert_extensions.py @@ -82,10 +82,8 @@ class Converter: os.makedirs(self.extDir, exist_ok=True) # Create a file for each namespace and save models. - extensionTemplate = """ -extensions: -{0} - """ + extensionTemplate = """extensions: +{0}""" for entry in extensions: with open(self.extDir + "/" + entry + self.modelFileExtension, "w") as f: f.write(extensionTemplate.format(extensions[entry])) diff --git a/misc/scripts/models-as-data/helpers.py b/misc/scripts/models-as-data/helpers.py index 4387ef53743..cc69cee53c0 100644 --- a/misc/scripts/models-as-data/helpers.py +++ b/misc/scripts/models-as-data/helpers.py @@ -7,13 +7,11 @@ import subprocess summaryModelPredicate = "extSummaryModel" sinkModelPredicate = "extSinkModel" sourceModelPredicate = "extSourceModel" -addsToTemplate = """ - - addsTo: +addsToTemplate = """ - addsTo: pack: {0} extensible: {1} data: -{2} - """ +{2}""" def remove_dir(dirName): if os.path.isdir(dirName):