Unverified Commit 2b75f887 authored by mbarkhau's avatar mbarkhau Committed by GitHub
Browse files

fix 1631 and add test (#1641)

parent 7fe19fac
Loading
Loading
Loading
Loading
+2 −0
Changes for CHANGES.md: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@
- `Black` now respects `--skip-string-normalization` when normalizing multiline
  docstring quotes (#1637)

- fixed a crash when PWD=/ on POSIX (#1631)

### 20.8b1

#### _Packaging_
+2 −1
Changes for src/black/__init__.py: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5831,7 +5831,8 @@ def normalize_path_maybe_ignore(
    `report` is where "path ignored" output goes.
    """
    try:
        normalized_path = path.resolve().relative_to(root).as_posix()
        abspath = path if path.is_absolute() else Path.cwd() / path
        normalized_path = abspath.resolve().relative_to(root).as_posix()
    except OSError as e:
        report.path_ignored(path, f"cannot be read because {e}")
        return None
+18 −0
Changes for tests/test_black.py: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@
from io import BytesIO, TextIOWrapper
import os
from pathlib import Path
from platform import system
import regex as re
import sys
from tempfile import TemporaryDirectory
@@ -1939,6 +1940,23 @@ def test_find_project_root(self) -> None:
            self.assertEqual(black.find_project_root((src_dir,)), src_dir.resolve())
            self.assertEqual(black.find_project_root((src_python,)), src_dir.resolve())

    def test_bpo_33660_workaround(self) -> None:
        if system() == "Windows":
            return

        # https://bugs.python.org/issue33660

        old_cwd = Path.cwd()
        try:
            root = Path("/")
            os.chdir(str(root))
            path = Path("workspace") / "project"
            report = black.Report(verbose=True)
            normalized_path = black.normalize_path_maybe_ignore(path, root, report)
            self.assertEqual(normalized_path, "workspace/project")
        finally:
            os.chdir(str(old_cwd))


class BlackDTestCase(AioHTTPTestCase):
    async def get_application(self) -> web.Application: