paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 12:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: Use trailing commas consistently.

Browse Source 
Automatically generated by the following script, based on the output
of lint with flake8-comma:

import re
import sys

last_filename = None
last_row = None
lines = []

for msg in sys.stdin:
    m = re.match(
        r"\x1b\[35mflake8    \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
    )
    if m:
        filename, row_str, col_str, err = m.groups()
        row, col = int(row_str), int(col_str)

        if filename == last_filename:
            assert last_row != row
        else:
            if last_filename is not None:
                with open(last_filename, "w") as f:
                    f.writelines(lines)

            with open(filename) as f:
                lines = f.readlines()
            last_filename = filename
        last_row = row

        line = lines[row - 1]
        if err in ["C812", "C815"]:
            lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
        elif err in ["C819"]:
            assert line[col - 2] == ","
            lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")

if last_filename is not None:
    with open(last_filename, "w") as f:
        f.writelines(lines)

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-04-09 20:23:40 -07:00
committed by Tim Abbott
parent b114eb2f10
commit 69730a78cc
310 changed files with 1789 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/webhooks/gitlab/tests.py
View File

@@ -425,7 +425,7 @@ class GitlabHookTests(WebhookTestCase):
'build_created',
expected_topic,
expected_message,
HTTP_X_GITLAB_EVENT="Job Hook"
HTTP_X_GITLAB_EVENT="Job Hook",
)
def test_build_started_event_message(self) -> None:
@@ -436,7 +436,7 @@ class GitlabHookTests(WebhookTestCase):
'build_started',
expected_topic,
expected_message,
HTTP_X_GITLAB_EVENT="Job Hook"
HTTP_X_GITLAB_EVENT="Job Hook",
)
def test_build_succeeded_event_message(self) -> None:
@@ -447,7 +447,7 @@ class GitlabHookTests(WebhookTestCase):
'build_succeeded',
expected_topic,
expected_message,
HTTP_X_GITLAB_EVENT="Job Hook"
HTTP_X_GITLAB_EVENT="Job Hook",
)
def test_build_created_event_message_legacy_event_name(self) -> None:
@@ -458,7 +458,7 @@ class GitlabHookTests(WebhookTestCase):
'build_created',
expected_topic,
expected_message,
HTTP_X_GITLAB_EVENT="Build Hook"
HTTP_X_GITLAB_EVENT="Build Hook",
)
def test_build_started_event_message_legacy_event_name(self) -> None:
@@ -469,7 +469,7 @@ class GitlabHookTests(WebhookTestCase):
'build_started',
expected_topic,
expected_message,
HTTP_X_GITLAB_EVENT="Build Hook"
HTTP_X_GITLAB_EVENT="Build Hook",
)
def test_build_succeeded_event_message_legacy_event_name(self) -> None:
@@ -480,7 +480,7 @@ class GitlabHookTests(WebhookTestCase):
'build_succeeded',
expected_topic,
expected_message,
HTTP_X_GITLAB_EVENT="Build Hook"
HTTP_X_GITLAB_EVENT="Build Hook",
)
def test_pipeline_succeeded_with_artifacts_event_message(self) -> None:
@@ -490,7 +490,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipline_succeeded_with_artifacts',
expected_topic,
expected_message
expected_message,
)
def test_pipeline_succeeded_event_message(self) -> None:
@@ -500,7 +500,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipeline_succeeded',
expected_topic,
expected_message
expected_message,
)
def test_pipeline_started_event_message(self) -> None:
@@ -510,7 +510,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipeline_started',
expected_topic,
expected_message
expected_message,
)
def test_pipeline_pending_event_message(self) -> None:
@@ -520,7 +520,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'pipeline_hook__pipeline_pending',
expected_topic,
expected_message
expected_message,
)
def test_issue_type_test_payload(self) -> None:
@@ -530,7 +530,7 @@ class GitlabHookTests(WebhookTestCase):
self.send_and_test_stream_message(
'test_hook__issue_test_payload',
expected_topic,
expected_message
expected_message,
)
@patch('zerver.lib.webhooks.common.check_send_webhook_message')

56
zerver/webhooks/gitlab/view.py
View File

@@ -35,7 +35,7 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
compare_url = '{}/compare/{}...{}'.format(
get_project_homepage(payload),
payload['before'],
payload['after']
payload['after'],
)
commits = [
@@ -43,7 +43,7 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
'name': commit.get('author').get('name'),
'sha': commit.get('id'),
'message': commit.get('message'),
'url': commit.get('url')
'url': commit.get('url'),
}
for commit in payload['commits']
]
@@ -52,20 +52,20 @@ def get_normal_push_event_body(payload: Dict[str, Any]) -> str:
get_user_name(payload),
compare_url,
get_branch_name(payload),
commits
commits,
)
def get_remove_branch_event_body(payload: Dict[str, Any]) -> str:
return get_remove_branch_event_message(
get_user_name(payload),
get_branch_name(payload)
get_branch_name(payload),
)
def get_tag_push_event_body(payload: Dict[str, Any]) -> str:
return get_push_tag_event_message(
get_user_name(payload),
get_tag_name(payload),
action="pushed" if payload.get('checkout_sha') else "removed"
action="pushed" if payload.get('checkout_sha') else "removed",
)
def get_issue_created_event_body(payload: Dict[str, Any],
@@ -84,7 +84,7 @@ def get_issue_created_event_body(payload: Dict[str, Any],
description,
get_objects_assignee(payload),
payload.get('assignees'),
title=payload['object_attributes'].get('title') if include_title else None
title=payload['object_attributes'].get('title') if include_title else None,
)
def get_issue_event_body(payload: Dict[str, Any], action: str,
@@ -94,7 +94,7 @@ def get_issue_event_body(payload: Dict[str, Any], action: str,
action,
get_object_url(payload),
payload['object_attributes'].get('iid'),
title=payload['object_attributes'].get('title') if include_title else None
title=payload['object_attributes'].get('title') if include_title else None,
)
def get_merge_request_updated_event_body(payload: Dict[str, Any],
@@ -102,12 +102,12 @@ def get_merge_request_updated_event_body(payload: Dict[str, Any],
if payload['object_attributes'].get('oldrev'):
return get_merge_request_event_body(
payload, "added commit(s) to",
include_title=include_title
include_title=include_title,
)
return get_merge_request_open_or_updated_body(
payload, "updated",
include_title=include_title
include_title=include_title,
)
def get_merge_request_event_body(payload: Dict[str, Any], action: str,
@@ -119,7 +119,7 @@ def get_merge_request_event_body(payload: Dict[str, Any], action: str,
pull_request.get('url'),
pull_request.get('iid'),
type='MR',
title=payload['object_attributes'].get('title') if include_title else None
title=payload['object_attributes'].get('title') if include_title else None,
)
def get_merge_request_open_or_updated_body(payload: Dict[str, Any], action: str,
@@ -135,7 +135,7 @@ def get_merge_request_open_or_updated_body(payload: Dict[str, Any], action: str,
pull_request.get('description'),
get_objects_assignee(payload),
type='MR',
title=payload['object_attributes'].get('title') if include_title else None
title=payload['object_attributes'].get('title') if include_title else None,
)
def get_objects_assignee(payload: Dict[str, Any]) -> Optional[str]:
@@ -167,7 +167,7 @@ def get_commented_merge_request_event_body(payload: Dict[str, Any],
action = '[commented]({}) on'.format(comment['url'])
url = '{}/merge_requests/{}'.format(
payload['project'].get('web_url'),
payload['merge_request'].get('iid')
payload['merge_request'].get('iid'),
)
return get_pull_request_event_message(
@@ -177,7 +177,7 @@ def get_commented_merge_request_event_body(payload: Dict[str, Any],
payload['merge_request'].get('iid'),
message=comment['note'],
type='MR',
title=payload.get('merge_request').get('title') if include_title else None
title=payload.get('merge_request').get('title') if include_title else None,
)
def get_commented_issue_event_body(payload: Dict[str, Any],
@@ -186,7 +186,7 @@ def get_commented_issue_event_body(payload: Dict[str, Any],
action = '[commented]({}) on'.format(comment['url'])
url = '{}/issues/{}'.format(
payload['project'].get('web_url'),
payload['issue'].get('iid')
payload['issue'].get('iid'),
)
return get_pull_request_event_message(
@@ -196,7 +196,7 @@ def get_commented_issue_event_body(payload: Dict[str, Any],
payload['issue'].get('iid'),
message=comment['note'],
type='Issue',
title=payload.get('issue').get('title') if include_title else None
title=payload.get('issue').get('title') if include_title else None,
)
def get_commented_snippet_event_body(payload: Dict[str, Any],
@@ -205,7 +205,7 @@ def get_commented_snippet_event_body(payload: Dict[str, Any],
action = '[commented]({}) on'.format(comment['url'])
url = '{}/snippets/{}'.format(
payload['project'].get('web_url'),
payload['snippet'].get('id')
payload['snippet'].get('id'),
)
return get_pull_request_event_message(
@@ -215,7 +215,7 @@ def get_commented_snippet_event_body(payload: Dict[str, Any],
payload['snippet'].get('id'),
message=comment['note'],
type='Snippet',
title=payload.get('snippet').get('title') if include_title else None
title=payload.get('snippet').get('title') if include_title else None,
)
def get_wiki_page_event_body(payload: Dict[str, Any], action: str) -> str:
@@ -237,7 +237,7 @@ def get_build_hook_event_body(payload: Dict[str, Any]) -> str:
return "Build {} from {} stage {}.".format(
payload.get('build_name'),
payload.get('build_stage'),
action
action,
)
def get_test_event_body(payload: Dict[str, Any]) -> str:
@@ -255,14 +255,14 @@ def get_pipeline_event_body(payload: Dict[str, Any]) -> str:
project_homepage = get_project_homepage(payload)
pipeline_url = '{}/pipelines/{}'.format(
project_homepage,
payload['object_attributes'].get('id')
payload['object_attributes'].get('id'),
)
builds_status = ""
for build in payload['builds']:
build_url = '{}/-/jobs/{}'.format(
project_homepage,
build.get('id')
build.get('id'),
)
artifact_filename = build.get('artifacts_file', {}).get('filename', None)
if artifact_filename:
@@ -275,13 +275,13 @@ def get_pipeline_event_body(payload: Dict[str, Any]) -> str:
build.get('name'),
build_url,
build.get('status'),
artifact_string
artifact_string,
)
return "[Pipeline ({})]({}) {} with build(s):\n{}.".format(
payload['object_attributes'].get('id'),
pipeline_url,
action,
builds_status[:-1]
builds_status[:-1],
)
def get_repo_name(payload: Dict[str, Any]) -> str:
@@ -356,7 +356,7 @@ def api_gitlab_webhook(request: HttpRequest, user_profile: UserProfile,
if 'include_title' in signature(event_body_function).parameters:
body = event_body_function(
payload,
include_title=user_specified_topic is not None
include_title=user_specified_topic is not None,
)
else:
body = event_body_function(payload)
@@ -387,28 +387,28 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> str:
repo=get_repo_name(payload),
type='MR',
id=payload['object_attributes'].get('iid'),
title=payload['object_attributes'].get('title')
title=payload['object_attributes'].get('title'),
)
elif event.startswith('Issue Hook') or event.startswith('Confidential Issue Hook'):
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repo_name(payload),
type='Issue',
id=payload['object_attributes'].get('iid'),
title=payload['object_attributes'].get('title')
title=payload['object_attributes'].get('title'),
)
elif event == 'Note Hook Issue' or event == 'Confidential Note Hook Issue':
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repo_name(payload),
type='Issue',
id=payload['issue'].get('iid'),
title=payload['issue'].get('title')
title=payload['issue'].get('title'),
)
elif event == 'Note Hook MergeRequest':
return TOPIC_WITH_PR_OR_ISSUE_INFO_TEMPLATE.format(
repo=get_repo_name(payload),
type='MR',
id=payload['merge_request'].get('iid'),
title=payload['merge_request'].get('title')
title=payload['merge_request'].get('title'),
)
elif event == 'Note Hook Snippet':
@@ -416,7 +416,7 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> str:
repo=get_repo_name(payload),
type='Snippet',
id=payload['snippet'].get('id'),
title=payload['snippet'].get('title')
title=payload['snippet'].get('title'),
)
return get_repo_name(payload)