Fix toml hashes and make it clear that only TOML is supported (#1510)

[etc/vim.git] / src / black / __init__.py

diff --git a/src/black/__init__.py b/src/black/__init__.py
index b32197acd43fa126b68b476b7687f005dd59f1f3..2b2d3d88c73a501a57bc2faa0022ee179553e0d2 100644 (file)
--- a/src/black/__init__.py
+++ b/src/black/__init__.py
@@ -281,12 +281,7 @@ def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
     """
     pyproject_toml = toml.load(path_config)
     config = pyproject_toml.get("tool", {}).get("black", {})
     """
     pyproject_toml = toml.load(path_config)
     config = pyproject_toml.get("tool", {}).get("black", {})

-    return {
-        k.replace("--", "").replace("-", "_"): str(v)
-        if not isinstance(v, (list, dict))
-        else v
-        for k, v in config.items()
-    }
+    return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}

 
 
 def read_pyproject_toml(
 
 
 def read_pyproject_toml(


@@ -311,6 +306,14 @@ def read_pyproject_toml(
 
     if not config:
         return None
 
     if not config:
         return None

+    else:
+        # Sanitize the values to be Click friendly. For more information please see:
+        # https://github.com/psf/black/issues/1458
+        # https://github.com/pallets/click/issues/1567
+        config = {
+            k: str(v) if not isinstance(v, (list, dict)) else v
+            for k, v in config.items()
+        }

 
     target_version = config.get("target_version")
     if target_version is not None and not isinstance(target_version, list):
 
     target_version = config.get("target_version")
     if target_version is not None and not isinstance(target_version, list):