Ticket #4573: django-linebreaks-v2.diff

django/utils/html.py

@@ -28 +28 @@
         html = str(html)
     return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;')
 
-def linebreaks(value):
-    "Converts newlines into <p> and <br />s"
+def linebreaks(value, paragraph=True, xhtml=True):
+    "Converts newlines into paragraphs (<p>) containing line breaks (<br />, <br>)"
+    br = '<br />'
+    if not xhtml:
+        br = '<br>'
+
     value = re.sub(r'\r\n|\r|\n', '\n', value) # normalize newlines
-    paras = re.split('\n{2,}', value)
-    paras = ['<p>%s</p>' % p.strip().replace('\n', '<br />') for p in paras]
-    return '\n\n'.join(paras)
 
+    if paragraph:
+        paras = re.split('\n{2,}', value)
+        paras = ['<p>%s</p>' % p.strip().replace('\n', br) for p in paras]
+        return '\n\n'.join(paras)
+    else:
+        return value.strip().replace('\n', br)
+
 def strip_tags(value):
     "Returns the given HTML with all tags stripped"
     return re.sub(r'<[^>]*?>', '', value)

django/template/defaultfilters.py

@@ -259 +259 @@
     return escape(value)
 escape = stringfilter(escape)
 
-def linebreaks(value):
-    "Converts newlines into <p> and <br />s"
+def linebreaks(value, arg=""):
+    "Converts newlines into paragraphs (<p>) containing line breaks (<br />, <br>)"
     from django.utils.html import linebreaks
-    return linebreaks(value)
+    xhtml = True
+    if arg == "html":
+        xhtml = False
+    return linebreaks(value, paragraph=True, xhtml=arg)
 linebreaks = stringfilter(linebreaks)
 
-def linebreaksbr(value):
-    "Converts newlines into <br />s"
-    return value.replace('\n', '<br />')
+def linebreaksbr(value, arg=""):
+    "Converts newlines into line breaks (<br />, <br>)"
+    from django.utils.html import linebreaks
+    xhtml = True
+    if arg == "html":
+        xhtml = False
+    return linebreaks(value, paragraph=False, xhtml=arg)
 linebreaksbr = stringfilter(linebreaksbr)
 
 def removetags(value, tags):

tests/regressiontests/defaultfilters/tests.py

@@ -440 +440 @@
 '123'
 >>> linebreaks(123)
 '<p>123</p>'
+>>> linebreaks('hello\nworld', 'html')
+'<p>hello<br>world</p>'
 >>> linebreaksbr(123)
 '123'
+>>> linebreaksbr('hello\nworld!')
+'hello<br />world'
+>>> linebreaksbr('hello\nworld!', 'html')
+'hello<br>world'
 >>> removetags(123, 'a')
 '123'
 >>> striptags(123)

docs/templates.txt

@@ -1059 +1059 @@
 ~~~~~~~~~~
 
 Converts newlines into ``<p>`` and ``<br />`` tags.
+Takes an optional argument - ``html`` which returns ``<br>``
+instead of ``<br />``.
 
 linebreaksbr
 ~~~~~~~~~~~~
 
 Converts newlines into ``<br />`` tags.
+Takes an optional argument - ``html`` which returns ``<br>``
+instead of ``<br />``.
 
 linenumbers
 ~~~~~~~~~~~