Skip to content
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.

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

Replace toml with tomli #829

Merged
merged 3 commits into from Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 12 additions & 8 deletions bandit/core/config.py
Expand Up @@ -3,13 +3,17 @@
#
# SPDX-License-Identifier: Apache-2.0
import logging
import sys

import yaml

try:
import toml
except ImportError:
toml = None
if sys.version_info >= (3, 11):
import tomllib
else:
try:
import tomli as tomllib
except ImportError:
tomllib = None

from bandit.core import constants
from bandit.core import extension_loader
Expand All @@ -34,23 +38,23 @@ def __init__(self, config_file=None):

if config_file:
try:
f = open(config_file)
f = open(config_file, "rb")
except OSError:
raise utils.ConfigError(
"Could not read config file.", config_file
)

if config_file.endswith(".toml"):
if toml is None:
if tomllib is None:
raise utils.ConfigError(
"toml parser not available, reinstall with toml extra",
config_file,
)

try:
with f:
self._config = toml.load(f)["tool"]["bandit"]
except toml.TomlDecodeError as err:
self._config = tomllib.load(f)["tool"]["bandit"]
except tomllib.TOMLDecodeError as err:
LOG.error(err)
raise utils.ConfigError("Error parsing file.", config_file)
else:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -30,7 +30,7 @@ project_urls =
yaml =
PyYAML
toml =
toml
tomli>=1.1.0; python_version < "3.11"

[entry_points]
console_scripts =
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Expand Up @@ -7,6 +7,6 @@ flake8>=4.0.0 # Apache-2.0
stestr>=2.5.0 # Apache-2.0
testscenarios>=0.5.0 # Apache-2.0/BSD
testtools>=2.3.0 # MIT
toml # MIT
tomli>=1.1.0;python_version<"3.11" # MIT
beautifulsoup4>=4.8.0 # MIT
pylint==1.9.4 # GPLv2