[#125] Read past blank lines in an ODS file.

CHANGELOG.md

@@ -1,4 +1,5 @@
 0.15 (wip, master)
+* #125 Fix ODS stopping at blank lines
 * #127 Fix reading of newer ODS files
 
 0.14.1 (1 September 2014)

messytables/ods.py

@@ -140,7 +140,8 @@ def raw(self, sample=False):
                         row_data.append(c)
 
             if not row_data:
-                raise StopIteration()
+                # ignore blank lines
+                continue
 
             del partial
             yield row_data

test/test_read.py

@@ -305,18 +305,6 @@ def test_read_large_ods(self):
         for row in row_set.sample:
             assert len(row) == 5, len(row)
 
-    def test_annotated_ods(self):
-        fh = horror_fobj('annotated.ods')
-        table_set = ODSTableSet(fh)
-        assert_equal(4, len(table_set.tables))
-        row_set = table_set.tables[0]
-        for row in row_set.sample:
-            assert len(row) == 1, len(row)
-
-        row_set = table_set.tables[1]
-        l = len(list(row_set.sample))
-        assert 87 == l, l
-
     def test_ods_version_4412(self):
         fh = horror_fobj('loffice-4.4.1.2.ods')
         table_set = ODSTableSet(fh)
@@ -328,6 +316,16 @@ def test_ods_version_4412(self):
         assert_equal(rows[2][0], 'Jane')
         assert_equal(rows[3][0], 'Ian')
 
+    def test_ods_read_past_blank_lines(self):
+        fh = horror_fobj('blank_line.ods')
+        table_set = ODSTableSet(fh)
+        assert_equal(1, len(table_set.tables))
+        row_set = table_set.tables[0]
+        rows = row_set_to_rows(row_set)
+        assert_equal(rows[0][0], 'Name')
+        assert_equal(rows[1][0], 'Bob')
+        assert_equal(rows[2][0], 'Jane')
+        assert_equal(rows[3][0], 'Ian')
 
 def row_set_to_rows(row_set):
     rows = []