Merge pull request #573 from nanonyme/nanonyme/tomllib

Use tomllib instead of vendored tomli when available
pypa · Aug 2, 2022 · 0850387 · 0850387
2 parents 5270ab2 + dba0f31
commit 0850387
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/flit_core/flit_core/config.py b/flit_core/flit_core/config.py
@@ -7,7 +7,11 @@
 from pathlib import Path
 import re
 
-from .vendor import tomli
+try:
+    import tomllib
+except ImportError:
+    from .vendor import tomli as tomllib
+
 from .versionno import normalise_version
 
 log = logging.getLogger(__name__)
@@ -66,7 +70,7 @@ class ConfigError(ValueError):
 def read_flit_config(path):
     """Read and check the `pyproject.toml` file with data about the package.
     """
-    d = tomli.loads(path.read_text('utf-8'))
+    d = tomllib.loads(path.read_text('utf-8'))
     return prep_toml_config(d, path)
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,6 @@ dependencies = [
     "flit_core >=3.7.1",
     "requests",
     "docutils",
-    "tomli",
     "tomli-w",
 ]
 requires-python = ">=3.6"
@@ -29,6 +28,7 @@ test = [
 	"responses",
 	"pytest>=2.7.3",
 	"pytest-cov",
+	"tomli",
 ]
 doc = [
 	"sphinx",