redo changes against current codebase, add tomli_w

Author: a-detiste

pyproject.toml

@@ -18,7 +18,8 @@ classifiers = [
 dependencies = [
     "loguru>=0.7.3",
     "platformdirs>=4.3.8",
-    "toml>=0.10.2",
+    "tomli>=2.2.1 ; python_full_version < '3.11'",
+    "tomli-w>=1.2.0",
     "typer>=0.15.4",
     "typing-extensions>=4.13.2",
 ]

src/maison/parsers/pyproject.py

@@ -1,8 +1,12 @@
 """A parser for pyproject.toml files."""
 
 import pathlib
+import sys
 
-import toml
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
 
 from maison import typedefs
 
@@ -25,7 +29,8 @@ def __init__(self, package_name: str) -> None:
     def parse_config(self, file_path: pathlib.Path) -> typedefs.ConfigValues:
         """See the Parser.parse_config method."""
         try:
-            pyproject_dict = dict(toml.load(file_path))
+            with file_path.open(mode="rb") as fd:
+                pyproject_dict = dict(tomllib.load(fd))
         except FileNotFoundError:
             return {}
         return dict(pyproject_dict.get("tool", {}).get(self._package_name, {}))

src/maison/parsers/toml.py

@@ -1,8 +1,12 @@
 """A parser for .toml files."""
 
 import pathlib
+import sys
 
-import toml
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
 
 from maison import typedefs
 
@@ -16,6 +20,7 @@ class TomlParser:
     def parse_config(self, file_path: pathlib.Path) -> typedefs.ConfigValues:
         """See the Parser.parse_config method."""
         try:
-            return dict(toml.load(file_path))
+            with file_path.open(mode="rb") as fd:
+                return dict(tomllib.load(fd))
         except (FileNotFoundError, toml.TomlDecodeError):
             return {}

tests/unit_tests/conftest.py

@@ -6,8 +6,7 @@
 from typing import Optional
 
 import pytest
-import toml
-
+import tomli_w
 
 @pytest.fixture(name="create_tmp_file")
 def create_tmp_file_fixture(tmp_path: Path) -> Callable[..., Path]:
@@ -30,7 +29,7 @@ def _create_toml(
         content: Optional[dict[str, Any]] = None,
     ) -> Path:
         content = content or {}
-        config_toml = toml.dumps(content)
+        config_toml = tomli_w.dumps(content)
         return create_tmp_file(content=config_toml, filename=filename)
 
     return _create_toml