fix vim plugin (#2615)

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

diff --git a/src/black/files.py b/src/black/files.py
index ba60c84a27528ed378aa2f7073ebd7c4d830aef5..560aa05080da9136beca90109247088e0d8dd67c 100644 (file)
--- a/src/black/files.py
+++ b/src/black/files.py
@@ -17,7 +17,9 @@ from typing import (
     TYPE_CHECKING,
 )
 
     TYPE_CHECKING,
 )
 

+from mypy_extensions import mypyc_attr

 from pathspec import PathSpec
 from pathspec import PathSpec

+from pathspec.patterns.gitwildmatch import GitWildMatchPatternError

 import tomli
 
 from black.output import err
 import tomli
 
 from black.output import err


@@ -87,13 +89,14 @@ def find_pyproject_toml(path_search_start: Tuple[str, ...]) -> Optional[str]:
         return None
 
 
         return None
 
 

+@mypyc_attr(patchable=True)

 def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
     """Parse a pyproject toml file, pulling out relevant parts for Black
 
     If parsing fails, will raise a tomli.TOMLDecodeError
     """
     with open(path_config, encoding="utf8") as f:
 def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
     """Parse a pyproject toml file, pulling out relevant parts for Black
 
     If parsing fails, will raise a tomli.TOMLDecodeError
     """
     with open(path_config, encoding="utf8") as f:

-        pyproject_toml = tomli.load(f)  # type: ignore  # due to deprecated API usage
+        pyproject_toml = tomli.loads(f.read())

     config = pyproject_toml.get("tool", {}).get("black", {})
     return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
 
     config = pyproject_toml.get("tool", {}).get("black", {})
     return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
 


@@ -122,7 +125,11 @@ def get_gitignore(root: Path) -> PathSpec:
     if gitignore.is_file():
         with gitignore.open(encoding="utf-8") as gf:
             lines = gf.readlines()
     if gitignore.is_file():
         with gitignore.open(encoding="utf-8") as gf:
             lines = gf.readlines()

-    return PathSpec.from_lines("gitwildmatch", lines)
+    try:
+        return PathSpec.from_lines("gitwildmatch", lines)
+    except GitWildMatchPatternError as e:
+        err(f"Could not parse {gitignore}: {e}")
+        raise

 
 
 def normalize_path_maybe_ignore(
 
 
 def normalize_path_maybe_ignore(