Skip to content

Add support for tomli to parse pyproject.toml #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add support for tomli to parse pyproject.toml #2014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions elpy/blackutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ def parse_version(*arg, **kwargs):

import os

try:
import tomli
except ImportError:
tomli = None

try:
import toml
except ImportError:
Expand Down Expand Up @@ -55,8 +60,15 @@ def fix_code(code, directory):
pyproject_path = find_pyproject_toml((directory,))
else:
pyproject_path = os.path.join(directory, "pyproject.toml")
if toml and pyproject_path and os.path.exists(pyproject_path):
pyproject_config = toml.load(pyproject_path)
if pyproject_path and os.path.exists(pyproject_path):
if tomli:
with open(pyproject_path, "rb") as pyproject_file:
pyproject_config = tomli.load(pyproject_file)
elif toml:
pyproject_config = toml.load(pyproject_path)
else:
err("pyproject.toml file found, but tomli was not installed")

black_config = pyproject_config.get("tool", {}).get("black", {})
if "line-length" in black_config:
line_length = black_config["line-length"]
Expand Down