almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-04 20:21:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 72bc34e4af into cf77b4c346

Browse source
This commit is contained in:
Jinx 2024-11-16 11:55:10 +01:00 committed by GitHub
commit 6c782a3623
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ihatemoney/tests/import_test.py
View file

@ -442,7 +442,7 @@ class TestExport(IhatemoneyTestCase):
'2016-12-31,red wine,Expense,XXX,200.0,jeanne,1.0,"zorglub, tata"', '2016-12-31,red wine,Expense,XXX,200.0,jeanne,1.0,"zorglub, tata"',
'2016-12-31,à raclette,Expense,10.0,XXX,zorglub,2.0,"zorglub, jeanne, tata, pépé"', '2016-12-31,à raclette,Expense,10.0,XXX,zorglub,2.0,"zorglub, jeanne, tata, pépé"',
] ]
received_lines = resp.data.decode("utf-8").split("\n") received_lines = resp.data.decode("utf-8-sig").split("\n")
for i, line in enumerate(expected): for i, line in enumerate(expected):
assert set(line.split(",")) == set(received_lines[i].strip("\r").split(",")) assert set(line.split(",")) == set(received_lines[i].strip("\r").split(","))
@ -476,7 +476,7 @@ class TestExport(IhatemoneyTestCase):
"55.34,XXX,jeanne,tata", "55.34,XXX,jeanne,tata",
"127.33,XXX,jeanne,zorglub", "127.33,XXX,jeanne,zorglub",
] ]
received_lines = resp.data.decode("utf-8").split("\n") received_lines = resp.data.decode("utf-8-sig").split("\n")
for i, line in enumerate(expected): for i, line in enumerate(expected):
assert set(line.split(",")) == set(received_lines[i].strip("\r").split(",")) assert set(line.split(",")) == set(received_lines[i].strip("\r").split(","))
@ -682,7 +682,7 @@ class TestExport(IhatemoneyTestCase):
"date,what,bill_type,amount,currency,payer_name,payer_weight,owers", "date,what,bill_type,amount,currency,payer_name,payer_weight,owers",
"2016-12-31,'=COS(36),Expense,10.0,EUR,zorglub,1.0,zorglub", "2016-12-31,'=COS(36),Expense,10.0,EUR,zorglub,1.0,zorglub",
] ]
received_lines = resp.data.decode("utf-8").split("\n") received_lines = resp.data.decode("utf-8-sig").split("\n")
for i, line in enumerate(expected): for i, line in enumerate(expected):
assert set(line.split(",")) == set(received_lines[i].strip("\r").split(",")) assert set(line.split(",")) == set(received_lines[i].strip("\r").split(","))

4
ihatemoney/utils.py
View file

@ -196,7 +196,7 @@ def list_of_dicts2csv(dict_to_convert):
writer = csv.writer(csv_file) writer = csv.writer(csv_file)
writer.writerows(csv_data) writer.writerows(csv_data)
csv_file.seek(0) csv_file.seek(0)
csv_file = BytesIO(csv_file.getvalue().encode("utf-8")) csv_file = BytesIO(csv_file.getvalue().encode("utf-8-sig"))
return csv_file return csv_file
@ -204,7 +204,7 @@ def csv2list_of_dicts(csv_to_convert):
"""Take a csv in-memory file and turns it into """Take a csv in-memory file and turns it into
a list of dictionnaries a list of dictionnaries
""" """
csv_file = TextIOWrapper(csv_to_convert, encoding="utf-8") csv_file = TextIOWrapper(csv_to_convert, encoding="utf-8-sig")
reader = csv.DictReader(csv_file) reader = csv.DictReader(csv_file)
result = [] result = []
for r in reader: for r in reader: