use json instead of python's marshal

deltachat · Mar 28, 2024 · cbaa692 · cbaa692
1 parent 6ab3e96
commit cbaa692
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/chatmaild/src/chatmaild/filedict.py b/chatmaild/src/chatmaild/filedict.py
@@ -1,6 +1,6 @@
 import os
 import logging
-import marshal
+import json
 import filelock
 from contextlib import contextmanager
 
@@ -20,14 +20,14 @@ def modify(self):
             data = self.read()
             yield data
             write_path = self.path.with_suffix(".tmp")
-            with write_path.open("wb") as f:
-                marshal.dump(data, f)
+            with write_path.open("w") as f:
+                json.dump(data, f)
             os.rename(write_path, self.path)
 
     def read(self):
         try:
-            with self.path.open("rb") as f:
-                return marshal.load(f)
+            with self.path.open("r") as f:
+                return json.load(f)
         except FileNotFoundError:
             return {}
         except Exception:

diff --git a/chatmaild/src/chatmaild/metadata.py b/chatmaild/src/chatmaild/metadata.py
@@ -35,7 +35,7 @@ def __init__(self, vmail_dir):
         self.to_notify_queue = Queue()
 
     def get_metadata_dict(self, addr):
-        return FileDict(self.vmail_dir / addr / "metadata.marshalled")
+        return FileDict(self.vmail_dir / addr / "metadata.json")
 
     def add_token(self, addr, token):
         with self.get_metadata_dict(addr).modify() as data: