From cdd626823aef5d2715f17724f6495be369687879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=81?= Date: Wed, 27 Jan 2021 16:27:34 +0300 Subject: [PATCH] Generation of the calculate.ini files was fixed #71 --- calculate/variables/ini_template | 3 ++- calculate/variables/loader.py | 2 +- tests/variables/test_datavars.py | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/calculate/variables/ini_template b/calculate/variables/ini_template index bbcc948..956b871 100644 --- a/calculate/variables/ini_template +++ b/calculate/variables/ini_template @@ -2,5 +2,6 @@ [{{ namespace_name | join('][') }}] {% for variable, value in namespace.items() -%} {{ variable }} {{ value | join(' ') }} -{% endfor %} +{% endfor -%} +{{ "" if loop.last else "\n" -}} {% endfor -%} diff --git a/calculate/variables/loader.py b/calculate/variables/loader.py index 18da850..a1087b9 100644 --- a/calculate/variables/loader.py +++ b/calculate/variables/loader.py @@ -729,7 +729,7 @@ class CalculateIniSaver: '''Метод для получения текста ini файла, полученного в результате наложения изменений из тегов save в шаблонах.''' ini_text = self.ini_template.render(ini_dictionary=ini_dictionary) - return ini_text.strip() + return ini_text class Datavars: diff --git a/tests/variables/test_datavars.py b/tests/variables/test_datavars.py index aec2150..33ce810 100644 --- a/tests/variables/test_datavars.py +++ b/tests/variables/test_datavars.py @@ -1498,14 +1498,16 @@ var_2 = val1,val2,val3,val4 var_3 = value [os][linux] -test_1 += 12''' +test_1 += 12 +''' system_ini_result = '''[custom][ns] var_5 = /highway/to/hell var_6 = 12 [os][linux] -test = new value''' +test = new value +''' template_engine.process_template_from_string(input_template_1, FILE) datavars.save_variables() @@ -1539,7 +1541,8 @@ key1 = weird1 [os][hashvar_2] id_1 = 1575 -id_2 = 1349''' +id_2 = 1349 +''' template_engine.process_template_from_string(input_template_1, FILE) datavars.save_variables()