From 80bfea74c10dec30a0fa64e1379b80c897b060a9 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Tue, 13 Jul 2021 11:23:09 +0100 Subject: Support TOML v1.0.0 syntax in `pyproject.toml` (#1186) * Support TOML v1.0.0 syntax in `pyproject.toml` fixes #1180 Co-authored-by: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com> * fix toml meta test * use pytest.mark.parametrize to narrow test failure * Update tests/test_config.py Co-authored-by: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com> Co-authored-by: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com> --- coverage/tomlconfig.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'coverage') diff --git a/coverage/tomlconfig.py b/coverage/tomlconfig.py index 1e0b1241..aa11a8a9 100644 --- a/coverage/tomlconfig.py +++ b/coverage/tomlconfig.py @@ -12,9 +12,9 @@ from coverage.misc import substitute_variables # TOML support is an install-time extra option. try: - import toml + import tomli except ImportError: # pragma: not covered - toml = None + tomli = None class TomlDecodeError(Exception): @@ -44,12 +44,12 @@ class TomlConfigParser: toml_text = fp.read() except OSError: return [] - if toml: + if tomli is not None: toml_text = substitute_variables(toml_text, os.environ) try: - self.data = toml.loads(toml_text) - except toml.TomlDecodeError as err: - raise TomlDecodeError(*err.args) + self.data = tomli.loads(toml_text) + except tomli.TOMLDecodeError as err: + raise TomlDecodeError(str(err)) return [filename] else: has_toml = re.search(r"^\[tool\.coverage\.", toml_text, flags=re.MULTILINE) -- cgit v1.2.1