Skip to content

Commit be85a28

Browse files
committed
Accept the header row as it is when reading ODS format
1 parent ffc5e56 commit be85a28

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/tablib/formats/_ods.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ def repeat(cell):
127127
if not row_vals:
128128
continue
129129
if i == skip_lines and headers:
130-
try:
131-
end = row_vals.index("")
132-
except ValueError:
133-
end = len(row_vals)
134-
dset.headers = row_vals[:end]
130+
dset.headers = row_vals
135131
else:
136132
if i > skip_lines:
137133
if len(row_vals) < dset.width:

tests/test_tablib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ def test_ods_import_set_ragged(self):
12601260
ods_source = Path(__file__).parent / 'files' / 'ragged.ods'
12611261
with ods_source.open('rb') as fh:
12621262
dataset = tablib.Dataset().load(fh, 'ods')
1263-
self.assertEqual(dataset[0], (1, '', True, ''))
1263+
self.assertEqual(dataset[0], (1, '', True) + ('',) * 16381)
12641264

12651265
def test_ods_import_columns_repeated(self):
12661266
ods = Path(__file__).parent / "files" / "columns_repeated.ods"

0 commit comments

Comments
 (0)