src/rougail/template.py

@@ -38,7 +38,6 @@ from tiramisu.error import PropertiesOptionError
 from .config import patch_dir
 from .error import FileNotFound, TemplateError, TemplateDisabled
 from .i18n import _
-from .utils import normalize_family
 
 
 log = logging.getLogger(__name__)
@@ -121,9 +120,8 @@ class CheetahTemplate(ChtTemplate):
         """
         ChtTemplate.__init__(self, file=filename,
                              searchList=[context, eosfunc, {'is_defined' : IsDefined(context),
-                                                            # 'creole_client' : CreoleClient(config),
+                                                            'creole_client' : CreoleClient(config),
-                                                            # 'current_container':CreoleGet(current_container),
+                                                            'current_container':CreoleGet(current_container),
-                                                            'normalize_family': normalize_family,
                                                             'rougail_filename': destfilename
                                                             }])
 

tests/templates/00base/result/test/etc/mailname

@@ -1 +0,0 @@
-oui

tests/templates/11disabled_if_in_filelist/result/test/tmp/file

@@ -1 +0,0 @@
-non

tests/templates/70container_files_symlink_multi/00-base.xml

@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<creole>
-  <family name="containers">
-    <family name="container0" doc="test">
-      <family doc="files" name="files">
-        <family doc="file0" name="file0">
-          <variable doc="" multi="False" name="mkdir" type="boolean">
-            <value>False</value>
-          </variable>
-          <variable multi="False" name="name" opt="creole.general.file_name" type="symlink"/>
-          <variable doc="" multi="False" name="rm" type="boolean">
-            <value>False</value>
-          </variable>
-          <variable doc="" multi="False" name="source" type="string">
-            <value>mailname</value>
-          </variable>
-          <variable doc="" multi="False" name="activate" type="boolean">
-            <value>True</value>
-          </variable>
-        </family>
-      </family>
-      <property>basic</property>
-    </family>
-  </family>
-  <family doc="" name="creole">
-    <family doc="général" name="general">
-      <property>normal</property>
-      <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
-        <choice type="string">oui</choice>
-        <choice type="string">non</choice>
-        <property>force_default_on_freeze</property>
-        <property>frozen</property>
-        <property>hidden</property>
-        <property>mandatory</property>
-        <property>normal</property>
-        <value type="string">oui</value>
-      </variable>
-      <variable doc="file_name" multi="True" name="file_name" type="string">
-        <property>mandatory</property>
-        <property>normal</property>
-        <value>/etc/mailname</value>
-        <value>/etc/mailname2</value>
-      </variable>
-    </family>
-    <separators/>
-  </family>
-</creole>

tests/templates/70container_files_symlink_multi/makedict/base.json

@@ -1 +0,0 @@
-{"creole.general.file_name": ["/etc/mailname", "/etc/mailname2"], "containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": ["/etc/mailname", "/etc/mailname2"], "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "mailname", "containers.container0.files.file0.activate": true}

tests/templates/70container_files_symlink_multi/result/test/etc/mailname

@@ -1 +0,0 @@
-tests/templates/70container_files_symlink_multi/dest/test/etc/mailname

tests/templates/70container_files_symlink_multi/result/test/etc/mailname2

@@ -1 +0,0 @@
-tests/templates/70container_files_symlink_multi/dest/test/etc/mailname2

tests/templates/70container_files_symlink_multi/tmpl/mailname

@@ -1 +0,0 @@
-%%rougail_filename

tests/test_template.py

@@ -71,5 +71,3 @@ def test_dictionary(test_dir):
         with open(template_file, 'r') as fh:
             generated_file = fh.read()
         assert result_file == generated_file
-    rmtree(dest_dir)
-    rmtree(tmp_dir)