[Erp5-report] r34950 jerome - in /erp5/trunk/products/Formulator: ./ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Mon May  3 17:16:58 2010
New Revision: 34950

URL: http://svn.erp5.org?rev=34950&view=rev
Log:
34924 was an incomplete fix, trailing empty line was omitted

Modified:
    erp5/trunk/products/Formulator/Validator.py
    erp5/trunk/products/Formulator/tests/testFormValidator.py

Modified: erp5/trunk/products/Formulator/Validator.py
URL: http://svn.erp5.org/erp5/trunk/products/Formulator/Validator.py?rev=34950&r1=34949&r2=34950&view=diff
==============================================================================
--- erp5/trunk/products/Formulator/Validator.py [utf8] (original)
+++ erp5/trunk/products/Formulator/Validator.py [utf8] Mon May  3 17:16:58 2010
@@ -387,7 +387,7 @@
     if max_length and len(value) > max_length:
       self.raise_error('too_long', field)
     # split input into separate lines
-    lines = value.splitlines()
+    lines = value.replace('\r\n', '\n').split('\n')
 
     # check whether we have too many lines
     max_lines = field.get_value('max_lines') or 0

Modified: erp5/trunk/products/Formulator/tests/testFormValidator.py
URL: http://svn.erp5.org/erp5/trunk/products/Formulator/tests/testFormValidator.py?rev=34950&r1=34949&r2=34950&view=diff
==============================================================================
--- erp5/trunk/products/Formulator/tests/testFormValidator.py [utf8] (original)
+++ erp5/trunk/products/Formulator/tests/testFormValidator.py [utf8] Mon May  3 17:16:58 2010
@@ -460,6 +460,11 @@
             'f', {'f' : 'foo\r\nbar '})
         self.assertEqual(['foo', 'bar '], result)
 
+    def test_empty_lines(self):
+        result = self.v.validate(
+            TestField('f', whitespace_preserve=True),
+            'f', {'f' : '\r\nfoo\r\n\r\nbar\r\n'})
+        self.assertEqual(['', 'foo', '', 'bar', ''], result)
 
 def test_suite():
     suite = unittest.TestSuite()