Ticket #19251: 19251-1.diff

django/forms/widgets.py

@@ -19 +19 @@
 from django.utils.translation import ugettext, ugettext_lazy
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.safestring import mark_safe
+from django.utils.text import normalize_newlines
 from django.utils import datetime_safe, formats, six
 
 __all__ = (
@@ -392 +393 @@
             return False
         return upload
 
+
 class Textarea(Widget):
     def __init__(self, attrs=None):
         # The 'rows' and 'cols' attributes are required for HTML correctness.
@@ -407 +409 @@
                            flatatt(final_attrs),
                            force_text(value))
 
+    def value_from_datadict(self, data, files, name):
+        value = super(Textarea, self).value_from_datadict(data, files, name)
+        return normalize_newlines(value)
+
 
 class DateInput(TextInput):
     def __init__(self, attrs=None, format=None):

tests/regressiontests/forms/tests/widgets.py

@@ -183 +183 @@
 
         self.assertHTMLEqual(w.render('msg', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), '<textarea rows="10" cols="40" name="msg" class="fun">\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111</textarea>')
 
+        # Test that newlines are normalized to LF
+        self.assertEqual(w.value_from_datadict({'test': "Content\r\nwith\r\nCRLF"}, {}, 'test'),
+            "Content\nwith\nCRLF")
+        self.assertEqual(w.value_from_datadict({'test': "Content\rwith\rCR"}, {}, 'test'),
+            "Content\nwith\nCR")
+        self.assertEqual(w.value_from_datadict({'test': "Content\nwith\nLF"}, {}, 'test'),
+            "Content\nwith\nLF")
+
     def test_checkboxinput(self):
         w = CheckboxInput()
         self.assertHTMLEqual(w.render('is_cool', ''), '<input type="checkbox" name="is_cool" />')