Exclude broken typing-extensions version + fix import (#2460)

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

diff --git a/src/black/files.py b/src/black/files.py
index 1be560643a1cae6500cb2fb81b645542b6feef39..4d7b47aaa9fcbb4b7abe96ded72c9811d0155402 100644 (file)
--- a/src/black/files.py
+++ b/src/black/files.py
@@ -18,10 +18,12 @@ from typing import (
 )
 
 from pathspec import PathSpec
 )
 
 from pathspec import PathSpec

-import toml
+from pathspec.patterns.gitwildmatch import GitWildMatchPatternError
+import tomli

 
 from black.output import err
 from black.report import Report
 
 from black.output import err
 from black.report import Report

+from black.handle_ipynb_magics import jupyter_dependencies_are_installed

 
 if TYPE_CHECKING:
     import colorama  # noqa: F401
 
 if TYPE_CHECKING:
     import colorama  # noqa: F401


@@ -38,7 +40,7 @@ def find_project_root(srcs: Sequence[str]) -> Path:
     project root, the root of the file system is returned.
     """
     if not srcs:
     project root, the root of the file system is returned.
     """
     if not srcs:

-        return Path("/").resolve()
+        srcs = [str(Path.cwd().resolve())]

 
     path_srcs = [Path(Path.cwd(), src).resolve() for src in srcs]
 
 
     path_srcs = [Path(Path.cwd(), src).resolve() for src in srcs]
 


@@ -89,9 +91,10 @@ def find_pyproject_toml(path_search_start: Tuple[str, ...]) -> Optional[str]:
 def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
     """Parse a pyproject toml file, pulling out relevant parts for Black
 
 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 toml.TomlDecodeError
+    If parsing fails, will raise a tomli.TOMLDecodeError

     """
     """

-    pyproject_toml = toml.load(path_config)
+    with open(path_config, encoding="utf8") as f:
+        pyproject_toml = tomli.load(f)  # type: ignore  # due to deprecated API usage

     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()}
 


@@ -118,9 +121,13 @@ def get_gitignore(root: Path) -> PathSpec:
     gitignore = root / ".gitignore"
     lines: List[str] = []
     if gitignore.is_file():
     gitignore = root / ".gitignore"
     lines: List[str] = []
     if gitignore.is_file():

-        with gitignore.open() as gf:
+        with gitignore.open(encoding="utf-8") as gf:

             lines = gf.readlines()
             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(


@@ -164,6 +171,9 @@ def gen_python_files(
     force_exclude: Optional[Pattern[str]],
     report: Report,
     gitignore: Optional[PathSpec],
     force_exclude: Optional[Pattern[str]],
     report: Report,
     gitignore: Optional[PathSpec],

+    *,
+    verbose: bool,
+    quiet: bool,

 ) -> Iterator[Path]:
     """Generate all files under `path` whose paths are not excluded by the
     `exclude_regex`, `extend_exclude`, or `force_exclude` regexes,
 ) -> Iterator[Path]:
     """Generate all files under `path` whose paths are not excluded by the
     `exclude_regex`, `extend_exclude`, or `force_exclude` regexes,


@@ -204,6 +214,8 @@ def gen_python_files(
             continue
 
         if child.is_dir():
             continue
 
         if child.is_dir():

+            # If gitignore is None, gitignore usage is disabled, while a Falsey
+            # gitignore is when the directory doesn't have a .gitignore file.

             yield from gen_python_files(
                 child.iterdir(),
                 root,
             yield from gen_python_files(
                 child.iterdir(),
                 root,


@@ -212,10 +224,16 @@ def gen_python_files(
                 extend_exclude,
                 force_exclude,
                 report,
                 extend_exclude,
                 force_exclude,
                 report,

-                gitignore,
+                gitignore + get_gitignore(child) if gitignore is not None else None,
+                verbose=verbose,
+                quiet=quiet,

             )
 
         elif child.is_file():
             )
 
         elif child.is_file():

+            if child.suffix == ".ipynb" and not jupyter_dependencies_are_installed(
+                verbose=verbose, quiet=quiet
+            ):
+                continue

             include_match = include.search(normalized_path) if include else True
             if include_match:
                 yield child
             include_match = include.search(normalized_path) if include else True
             if include_match:
                 yield child