paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-29 11:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

clubhouse: Fix PLR1704 Redefining argument with the local name action.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-06-27 11:16:51 -07:00
committed by Tim Abbott
parent 9fdc0eeb8e
commit 997dbcd5d9
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/webhooks/clubhouse/view.py
View File

@@ -172,7 +172,7 @@ def get_epic_create_body(payload: WildValue, action: WildValue) -> str:
) )
def get_comment_added_body(entity: str, payload: WildValue, action: WildValue) -> str: def get_comment_added_body(entity: str, payload: WildValue, ignored_action: WildValue) -> str:
actions = payload["actions"] actions = payload["actions"]
kwargs = {"entity": entity} kwargs = {"entity": entity}
for action in actions: for action in actions:
@@ -456,9 +456,7 @@ def get_story_update_attachment_body(payload: WildValue, action: WildValue) -> O
return FILE_ATTACHMENT_TEMPLATE.format(**kwargs) return FILE_ATTACHMENT_TEMPLATE.format(**kwargs)
def get_story_joined_label_list( def get_story_joined_label_list(payload: WildValue, label_ids_added: List[int]) -> str:
payload: WildValue, action: WildValue, label_ids_added: List[int]
) -> str:
labels = [] labels = []
for label_id in label_ids_added: for label_id in label_ids_added:
@@ -491,7 +489,7 @@ def get_story_label_body(payload: WildValue, action: WildValue) -> Optional[str]
return None return None
label_ids_added = label_ids["adds"].tame(check_list(check_int)) label_ids_added = label_ids["adds"].tame(check_list(check_int))
kwargs.update(labels=get_story_joined_label_list(payload, action, label_ids_added)) kwargs.update(labels=get_story_joined_label_list(payload, label_ids_added))
return ( return (
STORY_LABEL_TEMPLATE.format(**kwargs) STORY_LABEL_TEMPLATE.format(**kwargs)
@@ -622,7 +620,7 @@ def get_story_update_batch_body(payload: WildValue, action: WildValue) -> Option
if "adds" in label_ids: if "adds" in label_ids:
label_ids_added = label_ids["adds"].tame(check_list(check_int)) label_ids_added = label_ids["adds"].tame(check_list(check_int))
last_change = "label" last_change = "label"
labels = get_story_joined_label_list(payload, action, label_ids_added) labels = get_story_joined_label_list(payload, label_ids_added)
templates.append( templates.append(
STORY_UPDATE_BATCH_ADD_REMOVE_TEMPLATE.format( STORY_UPDATE_BATCH_ADD_REMOVE_TEMPLATE.format(
operation="{} added".format("was" if len(templates) == 0 else "and"), operation="{} added".format("was" if len(templates) == 0 else "and"),
@@ -666,9 +664,9 @@ def get_entity_name(entity: str, payload: WildValue, action: WildValue) -> Optio
name = action["name"].tame(check_string) if "name" in action else None name = action["name"].tame(check_string) if "name" in action else None
if name is None or action["entity_type"] == "branch": if name is None or action["entity_type"] == "branch":
for action in payload["actions"]: for other_action in payload["actions"]:
if action["entity_type"].tame(check_string) == entity: if other_action["entity_type"].tame(check_string) == entity:
name = action["name"].tame(check_string) name = other_action["name"].tame(check_string)
if name is None: if name is None:
for ref in payload["references"]: for ref in payload["references"]: