Merge branch 'main' into ericwb-patch-2

PyCQA · Dec 8, 2023 · c6f84d5 · c6f84d5
2 parents 6fa3f20 + 4dea02e
commit c6f84d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/bandit/__init__.py b/bandit/__init__.py
@@ -2,10 +2,7 @@
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 # SPDX-License-Identifier: Apache-2.0
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata
+from importlib import metadata
 
 from bandit.core import config  # noqa
 from bandit.core import context  # noqa

diff --git a/bandit/core/config.py b/bandit/core/config.py
@@ -52,7 +52,9 @@ def __init__(self, config_file=None):
 
                 try:
                     with f:
-                        self._config = tomllib.load(f)["tool"]["bandit"]
+                        self._config = (
+                            tomllib.load(f).get("tool", {}).get("bandit", {})
+                        )
                 except tomllib.TOMLDecodeError as err:
                     LOG.error(err)
                     raise utils.ConfigError("Error parsing file.", config_file)

diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,3 @@ PyYAML>=5.3.1 # MIT
 stevedore>=1.20.0 # Apache-2.0
 colorama>=0.3.9;platform_system=="Windows" # BSD License (3 clause)
 rich # MIT
-importlib-metadata;python_version<"3.8" # Apache-2.0