Windows fix

Author: Евгений Блинов

suby/run.py

@@ -48,7 +48,7 @@
 from suby.process_waiting import has_event_driven_wait, wait_for_process_exit
 from suby.subprocess_result import SubprocessResult
 
-StreamCallback = Callable[[str], Any]  # type: ignore[misc]
+StreamCallback = Callable[[str], Any]  # type: ignore[misc, unused-ignore]
 _CUSTOM_TOKEN_POLL_TIMEOUT_SECONDS = 0.0001
 _CANCELLATION_ERROR_TYPES: Mapping[Type[CancellationError], Type[CancellationError]] = {
     CantokConditionCancellationError: ConditionCancellationError,
@@ -287,6 +287,8 @@ def prepare_directory(directory: Optional[Union[str, Path]]) -> Optional[str]:
     try:
         directory_stat = cwd_path.stat()
     except FileNotFoundError as error:
+        if has_file_parent(cwd_path):
+            raise WrongDirectoryError(f'The directory {raw_text!r} cannot be resolved because an intermediate component is not a directory.') from error
         raise WrongDirectoryError(f'The directory {raw_text!r} does not exist.') from error
     except NotADirectoryError as error:
         raise WrongDirectoryError(f'The directory {raw_text!r} cannot be resolved because an intermediate component is not a directory.') from error
@@ -303,6 +305,16 @@ def prepare_directory(directory: Optional[Union[str, Path]]) -> Optional[str]:
     return str(cwd_path)
 
 
+def has_file_parent(path: Path) -> bool:
+    for parent in path.parents:
+        try:
+            parent_stat = parent.stat()
+        except OSError:
+            continue
+        return not stat.S_ISDIR(parent_stat.st_mode)
+    return False
+
+
 def build_subprocess_env(
     env: Optional[Mapping[str, str]],
     add_env: Optional[Mapping[str, str]],

tests/units/test_run_directory.py

@@ -24,6 +24,7 @@ def _child_cwd(**run_kwargs) -> Path:
         'import os; print(os.getcwd())',
         split=False,
         catch_output=True,
+        add_env={'PYTHONIOENCODING': 'utf-8'},
         **run_kwargs,
     )
 
@@ -119,7 +120,15 @@ def test_run_executes_in_relative_directory_values(tmp_path, monkeypatch, direct
     assert child_cwd.resolve() == (call_site / expected_relative).resolve()
 
 
-@pytest.mark.parametrize('name', ['dir with spaces', ' ', '  ', 'директория'])
+@pytest.mark.parametrize(
+    'name',
+    [
+        'dir with spaces',
+        pytest.param(' ', marks=pytest.mark.skipif(os.name == 'nt', reason='Windows path APIs do not preserve space-only directory names')),
+        pytest.param('  ', marks=pytest.mark.skipif(os.name == 'nt', reason='Windows path APIs do not preserve space-only directory names')),
+        'директория',
+    ],
+)
 def test_directory_string_is_not_split_or_normalized(tmp_path, name):
     """Spaces and unicode in directory names are passed as one cwd value."""
     directory = tmp_path / name