Ignore blank lines when editing class via CSV

Author: rouilj

CHANGES.txt

@@ -137,6 +137,7 @@ Fixed:
   Increment rdbms version from 5 to 6. Mysql rdbms classes were
   missing unique key constraint. Found during fix for issue2551142.
   See upgrading.txt.
+- ignore blank lines in CSV class editing. (John Rouillard)
 
 Features:
 - issue2550522 - Add 'filter' command to command-line

roundup/cgi/actions.py

@@ -513,6 +513,10 @@ def handle(self):
             # skip property names header
             if values == props:
                 continue
+            # skip blank lines. Can be in the middle
+            # of the data or a newline at end of file.
+            if len(values) == 0:
+                continue
 
             # extract the itemid
             itemid, values = values[0], values[1:]

test/test_cgi.py

@@ -1477,6 +1477,15 @@ def testEditCSVKeyword(self):
         self.assertEqual(cl._ok_message, ['Items edited OK'])
         k = self.db.keyword.getnode('1')
         self.assertEqual(k.name, u2s(u'\xe4\xf6\xfc'))
+        form = dict(rows='id,name\n1,newkey\n\n2,newerkey\n\n')
+        cl = self._make_client(form, userid='1', classname='keyword')
+        cl._ok_message = []
+        actions.EditCSVAction(cl).handle()
+        self.assertEqual(cl._ok_message, ['Items edited OK'])
+        k = self.db.keyword.getnode('1')
+        self.assertEqual(k.name, 'newkey')
+        k = self.db.keyword.getnode('2')
+        self.assertEqual(k.name, 'newerkey')
 
     def testEditCSVTest(self):