Merge pull request #40 from mgorny/tomli

Replace the obsolete toml package with tomllib/tomli

Author: haplo

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
   rev: v1.3.0
   hooks:
   - id: mypy
-    additional_dependencies: [black, types-pkg_resources, types-setuptools, types-toml]
+    additional_dependencies: [black, types-pkg_resources, types-setuptools]
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.4.0
   hooks:

pylsp_black/plugin.py

@@ -1,15 +1,20 @@
 import logging
 import os
+import sys
 from functools import lru_cache
 from pathlib import Path
 from typing import Dict, Optional
 
 import black
-import toml
 from pylsp import hookimpl
 from pylsp._utils import get_eol_chars
 from pylsp.config.config import Config
 
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
 logger = logging.getLogger(__name__)
 
 
@@ -155,8 +160,9 @@ def _load_config(filename: str, client_config: Config) -> Dict:
             return defaults
 
     try:
-        pyproject_toml = toml.load(str(pyproject_filename))
-    except (toml.TomlDecodeError, OSError):
+        with open(pyproject_filename, "rb") as f:
+            pyproject_toml = tomllib.load(f)
+    except (tomllib.TOMLDecodeError, OSError):
         logger.warning(
             "Error decoding pyproject.toml, using defaults: %r",
             defaults,

setup.cfg

@@ -18,15 +18,18 @@ classifiers =
 
 [options]
 packages = find:
-install_requires = python-lsp-server>=1.4.0; black>=22.3.0; toml
+install_requires =
+    python-lsp-server>=1.4.0
+    black>=22.3.0
+    tomli; python_version<'3.11'
 python_requires = >= 3.7
 
 [options.entry_points]
 pylsp = pylsp_black = pylsp_black.plugin
 
 [options.extras_require]
 # add any types-* packages to .pre-commit-config.yaml mypy additional_dependencies
-dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools; types-toml
+dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools
 
 [flake8]
 max-line-length = 88