Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/types/sheet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ impl CalamineCellIterator {
CalamineCellIterator {
empty_row,
position: 0,
start: range.start().unwrap(),
start: range.start().unwrap_or_default(),
iter: unsafe {
std::mem::transmute::<
calamine::Rows<'_, calamine::Data>,
Expand All @@ -269,6 +269,10 @@ impl CalamineCellIterator {
}

fn __next__(mut slf: PyRefMut<'_, Self>) -> PyResult<Option<Bound<'_, PyList>>> {
if slf.range.is_empty() {
return Ok(None);
}

slf.position += 1;
if slf.position > slf.start.0 {
slf.iter
Expand Down
18 changes: 18 additions & 0 deletions tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,24 @@ def test_xlsx_iter_rows():
assert data == list(reader.get_sheet_by_index(0).iter_rows())


@pytest.mark.parametrize("filename", ["base.xlsx", "base.xls", "base.xlsb", "base.ods"])
def test_iter_rows_empty_sheet(filename):
reader = CalamineWorkbook.from_object(PATH / filename)
sheet = reader.get_sheet_by_index(1)

assert sheet.start is None
assert sheet.end is None
rows = sheet.iter_rows()

assert list(rows) == []
for _ in range(3):
with pytest.raises(StopIteration):
next(rows)

sentinel = object()
assert next(rows, sentinel) is sentinel


def test_nrows():
reader = CalamineWorkbook.from_object(PATH / "base.xlsx")
sheet = reader.get_sheet_by_name("Sheet3")
Expand Down
Loading