Merge branch 'dev' into aziz/setup_python_fix

OpenMined · Jun 10, 2024 · 5e5ab7e · 5e5ab7e
2 parents de89761 + 28f29ba
commit 5e5ab7e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/syft/src/syft/service/sync/diff_state.py b/packages/syft/src/syft/service/sync/diff_state.py
@@ -310,7 +310,10 @@ def object_id(self) -> UID:
 
     @property
     def non_empty_object(self) -> SyftObject | None:
-        return self.low_obj or self.high_obj
+        if self.low_obj is not None:
+            return self.low_obj
+        else:
+            return self.high_obj
 
     @property
     def object_type(self) -> str: