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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Current (in progress)

- Nothing yet
- Better parsing fallback [#71](https://github.com/etalab/csvapi/pull/71)

## 1.0.5 (2020-11-17)

Expand Down
17 changes: 14 additions & 3 deletions csvapi/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,22 @@ def detect_encoding(filepath):


def from_csv(filepath, encoding='utf-8', sniff_limit=SNIFF_LIMIT):
"""Try first w/ sniffing and then w/o sniffing if it fails"""
"""Try first w/ sniffing and then w/o sniffing if it fails,
and then again by forcing ';' delimiter w/o sniffing"""
kwargs = {
'sniff_limit': sniff_limit,
'encoding': encoding,
'column_types': agate_tester()
}
try:
return agate.Table.from_csv(filepath, sniff_limit=sniff_limit, encoding=encoding, column_types=agate_tester())
return agate.Table.from_csv(filepath, **kwargs)
except ValueError:
return agate.Table.from_csv(filepath, encoding=encoding, column_types=agate_tester())
try:
kwargs.pop('sniff_limit')
return agate.Table.from_csv(filepath, **kwargs)
except ValueError:
kwargs['delimiter'] = ';'
return agate.Table.from_csv(filepath, **kwargs)


def from_excel(filepath, xlsx=False):
Expand Down
2 changes: 1 addition & 1 deletion requirements/install.pip
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ agate-excel==0.2.3
Quart==0.9.1
quart-cors==0.2.0
raven==6.10.0
cchardet==2.1.4
cchardet==2.1.7
python-stdnum==1.11