diff --git a/merge_v3.py b/merge_v3.py index 5bf6367..3cc3137 100644 --- a/merge_v3.py +++ b/merge_v3.py @@ -57,13 +57,13 @@ def merge_messages(*batches): if id is None: merged = merge_message(message, candidate) if merged is not None: - candidates.pop(index) + batch.pop(index) break elif (candidate.get("tags") or {}).get("id") == id: merged = merge_message(message, candidate) if merged is None: raise ValueError("TODO") - candidates.pop(index) + batch.pop(index) break if merged is not None: message = merged diff --git a/merge_v4.py b/merge_v4.py index 20df1ab..6983f98 100644 --- a/merge_v4.py +++ b/merge_v4.py @@ -85,13 +85,13 @@ def merge_messages(*batches): if id is None: merged = merge_message(message, candidate) if merged is not None: - candidates.pop(index) + batch.pop(index) break elif (candidate.get("tags") or {}).get("id") == id: merged = merge_message(message, candidate) if merged is None: raise ValueError("TODO") - candidates.pop(index) + batch.pop(index) break if merged is not None: message = merged