When a string expression has more than one part, it must always check…

… if parts are trivial (such as ``None``) and ensure that these are not output.
malthe · Mar 3, 2011 · 3584d83 · 3584d83
1 parent 5b4bcea
commit 3584d83
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/chameleon/tales.py b/src/chameleon/tales.py
@@ -449,6 +449,11 @@ def __call__(self, name, engine):
         if len(nodes) == 1:
             target = nodes[0]
         else:
+            nodes = [
+                template("NODE or ''", NODE=node, mode="eval")
+                for node in nodes
+                ]
+
             target = ast.BinOp(
                 left=ast.Str(s="%s" * len(nodes)),
                 op=ast.Mod(),

diff --git a/src/chameleon/tests/inputs/007-content-interpolation.pt b/src/chameleon/tests/inputs/007-content-interpolation.pt
@@ -2,5 +2,6 @@
   <body>
     ${'Hello world!'}
     ${literal}
+    ${None}
   </body>
 </html>
diff --git a/src/chameleon/tests/outputs/007.pt b/src/chameleon/tests/outputs/007.pt
@@ -2,5 +2,6 @@
   <body>
     Hello world!
     <div>Hello world!</div>
+
   </body>
 </html>
diff --git a/src/chameleon/tests/outputs/008.pt b/src/chameleon/tests/outputs/008.pt
@@ -1,6 +1,6 @@
 <html>
   <body>
-    None
+
     <div class="dynamic">
       static
     </div>