Added auto trim and lstrip for jinja template's blocks.

3 years ago · 19f92a0fe4
parent 4b474258fe
commit 19f92a0fe4
2 changed files with 6 additions and 3 deletions
--- a/calculate/templates/template_engine.py
+++ b/calculate/templates/template_engine.py
@ -1558,9 +1558,12 @@ class TemplateEngine:

        if directory_path is not None:
            self.environment = Environment(
-                                       loader=FileSystemLoader(directory_path))
+                                       loader=FileSystemLoader(directory_path),
+                                       trim_blocks=True,
+                                       lstrip_blocks=True)
        else:
-            self.environment = Environment()
+            self.environment = Environment(trim_blocks=True,
+                                           lstrip_blocks=True)

        self.environment.filters = CALCULATE_FILTERS

--- a/tests/templates/test_directory_processor.py
+++ b/tests/templates/test_directory_processor.py
@ -1446,7 +1446,7 @@ class TestDirectoryProcessor:
                           '# Processed template files:\n' +
                           f'# {template_path}\n' +
                           '#' + '-' * 79 +
-                           f'\n\n\ntemplate = {template_path}')
+                           f'\n\ntemplate = {template_path}')
        directory_processor = DirectoryProcessor(
                                         'install',
                                         datavars_module=datavars,