X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/b8450b9faee10f3a0a63378b58adde60a27964e0..37861b4ce264f16754f4459d19522a05844daf9f:/src/black/files.py?ds=inline diff --git a/src/black/files.py b/src/black/files.py index a0c92e8..4d7b47a 100644 --- a/src/black/files.py +++ b/src/black/files.py @@ -18,10 +18,12 @@ from typing import ( ) 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.handle_ipynb_magics import jupyter_dependencies_are_installed 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: - return Path("/").resolve() + srcs = [str(Path.cwd().resolve())] 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 - 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()} @@ -118,9 +121,13 @@ def get_gitignore(root: Path) -> PathSpec: 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() - 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( @@ -164,6 +171,9 @@ def gen_python_files( 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, @@ -215,9 +225,15 @@ def gen_python_files( force_exclude, report, gitignore + get_gitignore(child) if gitignore is not None else None, + verbose=verbose, + quiet=quiet, ) 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