split template

homeassistant/helpers/config_validation.py

@@ -233,14 +233,8 @@ def template(value):
     """Validate a jinja2 template."""
     if value is None:
         raise vol.Invalid('template value is None')
-    if isinstance(value, list):
-        for idx, element in enumerate(value):
-            value[idx] = template(element)
-        return value
-    if isinstance(value, dict):
-        for key, element in value.items():
-            value[key] = template(element)
-        return value
+    if isinstance(value, (list, dict)):
+        raise vol.Invalid('template value should be a string')
 
     value = str(value)
     try:
@@ -250,6 +244,20 @@ def template(value):
         raise vol.Invalid('invalid template ({})'.format(ex))
 
 
+def template_complex(value):
+    """Validate a complex jinja2 template."""
+    if isinstance(value, list):
+        for idx, element in enumerate(value):
+            value[idx] = template_complex(element)
+        return value
+    if isinstance(value, dict):
+        for key, element in value.items():
+            value[key] = template_complex(element)
+        return value
+
+    return template(value)
+
+
 def time(value):
     """Validate time."""
     time_val = dt_util.parse_time(value)
@@ -316,7 +324,7 @@ def validator(value):
     vol.Exclusive('service', 'service name'): service,
     vol.Exclusive('service_template', 'service name'): template,
     vol.Optional('data'): dict,
-    vol.Optional('data_template'): {match_all: template},
+    vol.Optional('data_template'): {match_all: template_complex},
     vol.Optional(CONF_ENTITY_ID): entity_ids,
 }), has_at_least_one_key('service', 'service_template'))
 

tests/helpers/test_config_validation.py

@@ -299,6 +299,22 @@ def test_template():
     """Test template validator."""
     schema = vol.Schema(cv.template)
 
+    for value in (None, '{{ partial_print }', '{% if True %}Hello', ['test']):
+        with pytest.raises(vol.MultipleInvalid):
+            schema(value)
+
+    for value in (
+        1, 'Hello',
+        '{{ beer }}',
+        '{% if 1 == 1 %}Hello{% else %}World{% endif %}',
+    ):
+        schema(value)
+
+
+def test_template_complex():
+    """Test template_complex validator."""
+    schema = vol.Schema(cv.template_complex)
+
     for value in (None, '{{ partial_print }', '{% if True %}Hello'):
         with pytest.raises(vol.MultipleInvalid):
             schema(value)