X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/fd6e92aa460659d26136f5f86878b47254480259..24ffc54a53b52293a54d7ef9f2105c26e945cc67:/src/black/files.py?ds=sidebyside diff --git a/src/black/files.py b/src/black/files.py index 8348e0d..b6c1cf3 100644 --- a/src/black/files.py +++ b/src/black/files.py @@ -151,23 +151,22 @@ def normalize_path_maybe_ignore( """ try: abspath = path if path.is_absolute() else Path.cwd() / path - normalized_path = abspath.resolve().relative_to(root).as_posix() - except OSError as e: - if report: - report.path_ignored(path, f"cannot be read because {e}") - return None - - except ValueError: - if path.is_symlink(): + normalized_path = abspath.resolve() + try: + root_relative_path = normalized_path.relative_to(root).as_posix() + except ValueError: if report: report.path_ignored( path, f"is a symbolic link that points outside {root}" ) return None - raise + except OSError as e: + if report: + report.path_ignored(path, f"cannot be read because {e}") + return None - return normalized_path + return root_relative_path def path_is_excluded(