diff --git a/src/rybak/tree_renderer.py b/src/rybak/tree_renderer.py index 05d39d9..a5402c3 100644 --- a/src/rybak/tree_renderer.py +++ b/src/rybak/tree_renderer.py @@ -130,8 +130,8 @@ def _render_file(self, template_name: str, target_name: str, data: TemplateData) ) def remove_stale(self) -> None: - for path, _, files in self._context.target_root.walk(False): - existing_dir_path = path.relative_to(self._context.target_root) + for path, _, files in os.walk(self._context.target_root, False): + existing_dir_path = Path(path).relative_to(self._context.target_root) removed_files: MutableSet[str] = set() for file_name in files: diff --git a/tests/compare.py b/tests/compare.py index f7798b6..5e76e15 100644 --- a/tests/compare.py +++ b/tests/compare.py @@ -1,9 +1,8 @@ -from collections.abc import Iterable from pathlib import Path -from typing import Optional +from typing import Iterable, Optional, Tuple -def dir_content(root: Path) -> Iterable[tuple[str, Optional[str]]]: +def dir_content(root: Path) -> Iterable[Tuple[str, Optional[str]]]: return sorted( (str(path.relative_to(root)), path.read_text() if path.is_file() else None) for path in root.rglob('*') )