move utf-8-sig to utf-8

Author: alserious

sqladmin/helpers.py

@@ -152,7 +152,7 @@ class _PseudoBuffer:
     interface.
     """
 
-    encoding = "utf_8_sig"
+    encoding = "utf-8"
 
     def write(self, value: T) -> bytes:
         return str(value).encode(self.encoding)

sqladmin/models.py

@@ -1187,7 +1187,7 @@ async def generate(writer: Writer) -> AsyncGenerator[Any, None]:
 
         return StreamingResponse(
             content=stream_to_csv(generate),
-            media_type="text/csv; charset=utf_8_sig",
+            media_type="text/csv; charset=utf-8",
             headers={"Content-Disposition": f"attachment;filename={filename}"},
         )
 

tests/test_views/test_view_async.py

@@ -778,6 +778,25 @@ def row_count(resp) -> int:
     assert row_count(response) == 3
 
 
+async def test_export_csv_utf8(client: AsyncClient) -> None:
+    async with session_maker() as session:
+        user_1 = User(name="Daniel", status="ACTIVE")
+        user_2 = User(name="دانيال", status="ACTIVE")
+        user_3 = User(name="積極的", status="ACTIVE")
+        user_4 = User(name="Даниэль", status="ACTIVE")
+        session.add(user_1)
+        session.add(user_2)
+        session.add(user_3)
+        session.add(user_4)
+        await session.commit()
+
+    response = await client.get("/admin/user/export/csv")
+    assert response.text == (
+        "name,status\r\nDaniel,ACTIVE\r\nدانيال,ACTIVE\r\n"
+        "積極的,ACTIVE\r\nДаниэль,ACTIVE\r\n"
+    )
+
+
 async def test_export_json(client: AsyncClient) -> None:
     async with session_maker() as session:
         user = User(name="Daniel", status="ACTIVE")
@@ -788,6 +807,27 @@ async def test_export_json(client: AsyncClient) -> None:
     assert response.text == '[{"name": "Daniel", "status": "ACTIVE"}]'
 
 
+async def test_export_json_utf8(client: AsyncClient) -> None:
+    async with session_maker() as session:
+        user_1 = User(name="Daniel", status="ACTIVE")
+        user_2 = User(name="دانيال", status="ACTIVE")
+        user_3 = User(name="積極的", status="ACTIVE")
+        user_4 = User(name="Даниэль", status="ACTIVE")
+        session.add(user_1)
+        session.add(user_2)
+        session.add(user_3)
+        session.add(user_4)
+        await session.commit()
+
+    response = await client.get("/admin/user/export/json")
+    assert response.text == (
+        '[{"name": "Daniel", "status": "ACTIVE"},'
+        '{"name": "دانيال", "status": "ACTIVE"},'
+        '{"name": "積極的", "status": "ACTIVE"},'
+        '{"name": "Даниэль", "status": "ACTIVE"}]'
+    )
+
+
 async def test_export_bad_type_is_404(client: AsyncClient) -> None:
     response = await client.get("/admin/user/export/bad_type")
     assert response.status_code == 404

tests/test_views/test_view_sync.py

@@ -732,6 +732,25 @@ def test_export_csv(client: TestClient) -> None:
     assert response.text == "name,status\r\nDaniel,ACTIVE\r\n"
 
 
+def test_export_csv_utf8(client: TestClient) -> None:
+    with session_maker() as session:
+        user_1 = User(name="Daniel", status="ACTIVE")
+        user_2 = User(name="دانيال", status="ACTIVE")
+        user_3 = User(name="積極的", status="ACTIVE")
+        user_4 = User(name="Даниэль", status="ACTIVE")
+        session.add(user_1)
+        session.add(user_2)
+        session.add(user_3)
+        session.add(user_4)
+        session.commit()
+
+    response = client.get("/admin/user/export/csv")
+    assert response.text == (
+        "name,status\r\nDaniel,ACTIVE\r\nدانيال,ACTIVE\r\n"
+        "積極的,ACTIVE\r\nДаниэль,ACTIVE\r\n"
+    )
+
+
 def test_export_json(client: TestClient) -> None:
     with session_maker() as session:
         user = User(name="Daniel", status="ACTIVE")
@@ -742,6 +761,27 @@ def test_export_json(client: TestClient) -> None:
     assert response.text == '[{"name": "Daniel", "status": "ACTIVE"}]'
 
 
+def test_export_json_utf8(client: TestClient) -> None:
+    with session_maker() as session:
+        user_1 = User(name="Daniel", status="ACTIVE")
+        user_2 = User(name="دانيال", status="ACTIVE")
+        user_3 = User(name="積極的", status="ACTIVE")
+        user_4 = User(name="Даниэль", status="ACTIVE")
+        session.add(user_1)
+        session.add(user_2)
+        session.add(user_3)
+        session.add(user_4)
+        session.commit()
+
+    response = client.get("/admin/user/export/json")
+    assert response.text == (
+        '[{"name": "Daniel", "status": "ACTIVE"},'
+        '{"name": "دانيال", "status": "ACTIVE"},'
+        '{"name": "積極的", "status": "ACTIVE"},'
+        '{"name": "Даниэль", "status": "ACTIVE"}]'
+    )
+
+
 def test_export_json_complex_model(client: TestClient) -> None:
     with session_maker() as session:
         user = User(name="Daniel", status="ACTIVE")