remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-09-29 05:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

add io.buffer in _extra_key_strategy to ensure is closed in the end

Browse source
This commit is contained in:
lbellomo 2024-03-31 18:35:43 -03:00
commit d3f097901c
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sqlite_utils/utils.py
View file

@ -212,6 +212,7 @@ def _extra_key_strategy(
reader: Iterable[dict], reader: Iterable[dict],
ignore_extras: Optional[bool] = False, ignore_extras: Optional[bool] = False,
extras_key: Optional[str] = None, extras_key: Optional[str] = None,
buffer: Optional[io.TextIOWrapper] = None,
) -> Iterable[dict]: ) -> Iterable[dict]:
# Logic for handling CSV rows with more values than there are headings # Logic for handling CSV rows with more values than there are headings
for row in reader: for row in reader:
@ -231,6 +232,8 @@ def _extra_key_strategy(
else: else:
row[extras_key] = row.pop(None) # type: ignore row[extras_key] = row.pop(None) # type: ignore
yield row yield row
if buffer:
buffer.close()
def rows_from_file( def rows_from_file(
@ -299,7 +302,10 @@ def rows_from_file(
reader = csv.DictReader(decoded_fp, dialect=dialect) reader = csv.DictReader(decoded_fp, dialect=dialect)
else: else:
reader = csv.DictReader(decoded_fp) reader = csv.DictReader(decoded_fp)
return _extra_key_strategy(reader, ignore_extras, extras_key), Format.CSV return (
_extra_key_strategy(reader, ignore_extras, extras_key, decoded_fp),
Format.CSV,
)
elif format == Format.TSV: elif format == Format.TSV:
rows = rows_from_file( rows = rows_from_file(
fp, format=Format.CSV, dialect=csv.excel_tab, encoding=encoding fp, format=Format.CSV, dialect=csv.excel_tab, encoding=encoding