fix(toml): complete migration off uiri/toml; add tomli for Py3.10 decode

Per maintainer review (CHANGES_REQUESTED, fabiocaccamo): replace abandoned
uiri/toml dependency with tomli (Python 3.10) + tomllib (Python 3.11+).
Encode side stays on tomli_w (no change). Net: uiri/toml fully removed.

Fix mypy CI gate:
- benedict/serializers/toml.py:52 — explicit str annotation on
  tomli_w.dumps() return value to satisfy [no-any-return] check.

Auxiliary test file rename + typo fix:
- tests/dicts/io/test_io_dict_toml.py — patched flag renamed
  toml_installed -> tomli_installed; "tomlib" -> "tomllib" in skip-message.

Verified locally: pre-commit clean (9/9 hooks pass including mypy);
pytest tests/serializers/test_toml_serializer.py + tests/dicts/io/test_io_dict_toml.py
21 passed, 1 skipped (skip is correct — tomllib available on Py3.11+).

Author: ricaskew

benedict/serializers/toml.py

@@ -1,9 +1,17 @@
 try:
-    import toml
+    # python >= 3.11
+    import tomllib
 
-    toml_installed = True
+    tomllib_available = True
+except ImportError:
+    tomllib_available = False
+
+try:
+    import tomli
+
+    tomli_installed = True
 except ModuleNotFoundError:
-    toml_installed = False
+    tomli_installed = False
 
 try:
     import tomli_w
@@ -12,14 +20,6 @@
 except ModuleNotFoundError:
     tomli_w_installed = False
 
-try:
-    # python >= 3.11
-    import tomllib
-
-    tomllib_available = True
-except ImportError:
-    tomllib_available = False
-
 from typing import Any
 
 from benedict.extras import require_toml
@@ -42,11 +42,11 @@ def decode(self, s: str, **kwargs: Any) -> Any:
         if tomllib_available:
             data = tomllib.loads(s, **kwargs)
         else:
-            require_toml(installed=toml_installed)
-            data = toml.loads(s, **kwargs)
+            require_toml(installed=tomli_installed)
+            data = tomli.loads(s, **kwargs)
         return data
 
     def encode(self, d: Any, **kwargs: Any) -> str:
         require_toml(installed=tomli_w_installed)
-        data = tomli_w.dumps(dict(d), **kwargs)
-        return data
+        result: str = tomli_w.dumps(dict(d), **kwargs)
+        return result

pyproject.toml

@@ -138,7 +138,7 @@ s3 = [
     "boto3 >= 1.24.89, < 2.0.0",
 ]
 toml = [
-    "toml >= 0.10.2, < 1.0.0; python_version < '3.11'",
+    "tomli >= 2.0.0, < 3.0.0; python_version < '3.11'",
     "tomli-w >= 1.0.0, < 2.0.0",
 ]
 xls = [

requirements.txt

@@ -11,7 +11,7 @@ python-fsutil == 0.16.1
 python-slugify == 8.0.4
 pyyaml == 6.0.3
 requests == 2.33.1
-toml == 0.10.2
+tomli == 2.0.2
 tomli-w == 1.2.0
 typing_extensions >= 4.14.1
 urllib3 >= 2.6.3

tests/dicts/io/test_io_dict_toml.py

@@ -50,9 +50,9 @@ def test_from_toml_with_valid_data(self) -> None:
 
     @unittest.skipIf(
         tomllib_available,
-        "standard tomlib is available, exception will not be raised",
+        "standard tomllib is available, exception will not be raised",
     )
-    @patch("benedict.serializers.toml.toml_installed", False)
+    @patch("benedict.serializers.toml.tomli_installed", False)
     def test_from_toml_with_valid_data_but_toml_extra_not_installed(self) -> None:
         j = """
 a = 1