miklo
/
pandas_ods_reader
mirror of https://forge.citizen4.eu/miklo/pandas_ods_reader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lxml type issues.

This commit is contained in:
ljnsn 2022-12-21 20:14:59 +01:00
parent 1c255f60e7
commit d459a732ca
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandas_ods_reader/parsers/fods.py
View File

@ -1,5 +1,5 @@
from pathlib import Path from pathlib import Path
from typing import Any, Iterator, Union from typing import Iterator, Optional, Union
from lxml import etree from lxml import etree
@ -44,7 +44,7 @@ def get_rows(
raise ValueError("Sheet id has to be either `str` or `int`") raise ValueError("Sheet id has to be either `str` or `int`")
root = doc.getroot() root = doc.getroot()
namespaces = root.nsmap namespaces = root.nsmap
spreadsheet = doc.find(BODY_TAG, namespaces=namespaces).find( spreadsheet = doc.find(BODY_TAG, namespaces=namespaces).find( # type: ignore
SPREADSHEET_TAG, namespaces=namespaces SPREADSHEET_TAG, namespaces=namespaces
) )
sheet = get_sheet(spreadsheet, sheet_id) sheet = get_sheet(spreadsheet, sheet_id)
@ -57,15 +57,18 @@ def is_float(cell: etree._Element) -> bool:
) )
def get_value(cell: etree._Element, parsed: bool = False) -> tuple[Any, int]: def get_value(
cell: etree._Element,
parsed: bool = False,
) -> tuple[Optional[Union[str, float]], int]:
text = cell.find(TABLE_CELL_TEXT_TAG, namespaces=cell.nsmap) text = cell.find(TABLE_CELL_TEXT_TAG, namespaces=cell.nsmap)
if text is None: if text is None:
return None, 0 return None, 0
value = text.text value: Union[str, float] = text.text or ""
if parsed and is_float(cell): if parsed and is_float(cell):
value = float(value) value = float(value)
n_repeated = cell.attrib.get( _n_repeated = cell.attrib.get(
f"{{{cell.nsmap[TABLE_KEY]}}}{TABLE_CELL_REPEATED_ATTRIB}" f"{{{cell.nsmap[TABLE_KEY]}}}{TABLE_CELL_REPEATED_ATTRIB}"
) )
n_repeated = int(n_repeated) if n_repeated is not None else 0 n_repeated = int(_n_repeated) if _n_repeated is not None else 0
return value, n_repeated return value, n_repeated