diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,4 @@ swh.storage >= 0.7.0 -swh.model >= 0.3 +swh.model >= 0.3.5 swh.scheduler >= 0.0.39 swh.loader.core >= 0.3.2 diff --git a/swh/loader/svn/ra.py b/swh/loader/svn/ra.py --- a/swh/loader/svn/ra.py +++ b/swh/loader/svn/ra.py @@ -460,12 +460,13 @@ directories: List[Directory] = [] for obj in self.directory.iter_tree(): obj = obj.to_model() - if isinstance(obj, Content): + obj_type = obj.object_type + if obj_type in ("content_file", "content"): obj = obj.with_data() contents.append(obj) - elif isinstance(obj, SkippedContent): + elif obj_type == "skipped_content": skipped_contents.append(obj) - elif isinstance(obj, Directory): + elif obj_type == "directory": directories.append(obj) else: raise TypeError(f"Unexpected content type from disk: {obj}")