From 6f19d94cf12146f381caab59618d8ba8a4a992b1 Mon Sep 17 00:00:00 2001 From: Josh Ferrell Date: Wed, 25 Sep 2024 10:32:32 -0400 Subject: Fix python merge conflict handlers --- python/collaboration/merge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'python') diff --git a/python/collaboration/merge.py b/python/collaboration/merge.py index 2c64d304..1df16c57 100644 --- a/python/collaboration/merge.py +++ b/python/collaboration/merge.py @@ -220,10 +220,10 @@ class ConflictHandler: """ Helper class that resolves conflicts """ - def _handle(self, ctxt: ctypes.c_void_p, keys: ctypes.POINTER(ctypes.c_char_p), conflicts: ctypes.POINTER(core.BNAnalysisMergeConflictHandle), count: ctypes.c_ulonglong) -> bool: + def _handle(self, ctxt: ctypes.c_void_p, keys: ctypes.POINTER(ctypes.c_char_p), conflicts: ctypes.POINTER(core.BNAnalysisMergeConflictHandle), count: int) -> bool: try: py_conflicts = {} - for i in range(count.value): + for i in range(count): py_conflicts[core.pyNativeStr(keys[i])] = MergeConflict(handle=conflicts[i]) return self.handle(py_conflicts) except: -- cgit v1.3.1