diff options
| author | Josh Ferrell <josh@vector35.com> | 2024-09-25 10:32:32 -0400 |
|---|---|---|
| committer | Josh Ferrell <josh@vector35.com> | 2024-09-25 17:11:33 -0400 |
| commit | 6f19d94cf12146f381caab59618d8ba8a4a992b1 (patch) | |
| tree | 774ee3a896bdbd9c34bff2c96c351316c61a45ed /python/collaboration | |
| parent | 58936354f9adc194293e1b899bcd428ccb7a537b (diff) | |
Fix python merge conflict handlers
Diffstat (limited to 'python/collaboration')
| -rw-r--r-- | python/collaboration/merge.py | 4 |
1 files changed, 2 insertions, 2 deletions
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: |