Ticket #14288: 14288.linebreaksbr-normalized-newlines.2.diff

django/template/defaultfilters.py

@@ -12 +12 @@
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.translation import ugettext, ungettext
+from django.utils.text import normalize_newlines
 
 register = Library()
 
@@ -414 +415 @@
     Converts all newlines in a piece of plain text to HTML line breaks
     (``<br />``).
     """
-    if autoescape and not isinstance(value, SafeData):
+    autoescape = autoescape and not isinstance(value, SafeData)
+    value = normalize_newlines(value)
+    if autoescape:
         from django.utils.html import escape
         value = escape(value)
     return mark_safe(value.replace('\n', '<br />'))

django/utils/html.py

@@ -7 +7 @@
 from django.utils.encoding import force_unicode
 from django.utils.functional import allow_lazy
 from django.utils.http import urlquote
+from django.utils.text import normalize_newlines
 
 # Configuration for urlize() function.
 LEADING_PUNCTUATION  = ['(', '<', '&lt;']
@@ -70 +71 @@
 
 def linebreaks(value, autoescape=False):
     """Converts newlines into <p> and <br />s."""
-    value = re.sub(r'\r\n|\r|\n', '\n', force_unicode(value)) # normalize newlines
+    value = normalize_newlines(value)
     paras = re.split('\n{2,}', value)
     if autoescape:
         paras = [u'<p>%s</p>' % escape(p).replace('\n', '<br />') for p in paras]

tests/regressiontests/defaultfilters/tests.py

@@ -266 +266 @@
         self.assertEqual(linebreaks(u'line 1'), u'<p>line 1</p>')
         self.assertEqual(linebreaks(u'line 1\nline 2'),
                           u'<p>line 1<br />line 2</p>')
+        self.assertEqual(linebreaks(u'line 1\rline 2'),
+                          u'<p>line 1<br />line 2</p>')
+        self.assertEqual(linebreaks(u'line 1\r\nline 2'),
+                          u'<p>line 1<br />line 2</p>')
+    
+    def test_linebreaksbr(self):
+        self.assertEqual(linebreaksbr(u'line 1\nline 2'),
+                          u'line 1<br />line 2')
+        self.assertEqual(linebreaksbr(u'line 1\rline 2'), 
+                          u'line 1<br />line 2')
+        self.assertEqual(linebreaksbr(u'line 1\r\nline 2'), 
+                          u'line 1<br />line 2')
 
     def test_removetags(self):
         self.assertEqual(removetags(u'some <b>html</b> with <script>alert'\