Merge 72bc34e4af into c2db991ffd

Co-authored-by: Baptiste Jonglez <git@bitsofnetworks.org>
Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>

CHANGELOG.md

@@ -5,6 +5,10 @@ This document describes changes between each past release.
 ## 6.2.0 (unreleased)
 
 - Add support for python 3.12 (#757)
+- Migrate from setup.cfg to pyproject.toml (#1243)
+- Update to wtforms 3.1 (#1248)
+- Document [repository rules](https://ihatemoney.readthedocs.io/en/latest/contributing.html#repository-rules) (#1253)
+- Add "reimbursement" bills and allow to create them directly from the "Settle" page (#1290)
 - Remove support for python 3.7
 - Replace the black linter by ruff
 - Replace virtualenv and pip by uv

ihatemoney/tests/import_test.py

@@ -442,7 +442,7 @@ class TestExport(IhatemoneyTestCase):
             '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é"',
         ]
-        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):
             assert set(line.split(",")) == set(received_lines[i].strip("\r").split(","))
@@ -476,7 +476,7 @@ class TestExport(IhatemoneyTestCase):
             "55.34,XXX,jeanne,tata",
             "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):
             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",
             "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):
             assert set(line.split(",")) == set(received_lines[i].strip("\r").split(","))

ihatemoney/utils.py

@@ -194,7 +194,7 @@ def list_of_dicts2csv(dict_to_convert):
     writer = csv.writer(csv_file)
     writer.writerows(csv_data)
     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
 
 
@@ -202,7 +202,7 @@ def csv2list_of_dicts(csv_to_convert):
     """Take a csv in-memory file and turns it into
     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)
     result = []
     for r in reader: