From ef78a74ef798b502a76496cae4c1ddda243743a4 Mon Sep 17 00:00:00 2001 From: Raphael Krupinski Date: Fri, 23 Feb 2024 22:35:52 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Backport=20to=20python=203.8=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rybak/tree_renderer.py | 4 ++-- tests/compare.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) 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('*') )