# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1697206048 -7200 # Fri Oct 13 16:07:28 2023 +0200 # Node ID 95553d315de69fb989ac6ef7654eaba3ec2f89de # Parent aff010b06c3ce580534346d23cf964fba6fd4be1 Use tomli instead of toml, faster diff --git a/NEWS.rst b/NEWS.rst --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,11 @@ History ======= +20.10.0 +------- + +Use tomli instead of toml for python < 3.11. + 20.9.0 ------ diff --git a/odoo_scripts/config.py b/odoo_scripts/config.py --- a/odoo_scripts/config.py +++ b/odoo_scripts/config.py @@ -12,13 +12,9 @@ try: # Python 3.11+ - from tomllib import loads as tomllib_loads - - _tomllib: bool = True + from tomllib import loads as toml_loads except ImportError: - from toml import loads as toml_loads - - _tomllib = False + from tomli import loads as toml_loads SECTION = "odoo_scripts" OTHER_SOURCES_KEY = "other_sources" @@ -87,10 +83,7 @@ if os.path.exists(global_setup_path): with open(global_setup_path, "r") as f: global_setup_str = f.read() - if _tomllib: - self._global_setup = dict(tomllib_loads(global_setup_str)) - else: - self._global_setup = dict(toml_loads(global_setup_str)) + self._global_setup = dict(toml_loads(global_setup_str)) # read expanded configurations information expanded_info: defaultdict[Any, Dict] = defaultdict(dict) diff --git a/pyproject.toml b/pyproject.toml --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ "PyYAML", "importlib_metadata; python_version<'3.8'", "python-hglib", - "toml; python_version<='3.10'", + "tomli; python_version<='3.10'", ] [project.optional-dependencies]