gracefully handle None in nl2br filter

jbalogh · Mar 25, 2010 · 9e8d1ad · 9e8d1ad
1 parent d6db9e6
commit 9e8d1ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/jingo/helpers.py b/jingo/helpers.py
@@ -27,6 +27,8 @@ def f(string, *args, **kwargs):
 @register.filter
 def nl2br(string):
     """Turn newlines into <br>."""
+    if not string:
+        return ''
     return jinja2.Markup('<br>'.join(jinja2.escape(string).splitlines()))
 
 

diff --git a/jingo/tests/test_helpers.py b/jingo/tests/test_helpers.py
@@ -21,6 +21,10 @@ def test_nl2br():
     s = render('{{ x|nl2br }}', {'x': text})
     eq_(s, "some<br>text<br><br>with<br>newlines")
 
+    text = None
+    s = render('{{ x|nl2br }}', {'x': text})
+    eq_(s, '')
+
 
 def test_datetime():
     time = datetime(2009, 12, 25, 10, 11, 12)