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

github_legacy: Suppress certain TypeError exceptions.

Browse Source
This commit is contained in:
Tim Abbott
2018-04-26 10:11:46 -07:00
parent 330d75efb7
commit 32c841dfbc
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/webhooks/github_legacy/view.py
View File

@@ -8,7 +8,7 @@ from django.http import HttpRequest, HttpResponse
from zerver.decorator import authenticated_api_view, \ from zerver.decorator import authenticated_api_view, \
to_non_negative_int to_non_negative_int
from zerver.lib.request import REQ, has_request_variables from zerver.lib.request import REQ, has_request_variables, JsonableError
from zerver.lib.response import json_success from zerver.lib.response import json_success
from zerver.lib.validator import check_dict from zerver.lib.validator import check_dict
from zerver.lib.webhooks.git import SUBJECT_WITH_BRANCH_TEMPLATE, \ from zerver.lib.webhooks.git import SUBJECT_WITH_BRANCH_TEMPLATE, \
@@ -301,7 +301,13 @@ def build_message_from_gitlog(user_profile: UserProfile, name: Text, ref: Text,
content = get_force_push_commits_event_message(pusher, url, short_ref, after[:7]) content = get_force_push_commits_event_message(pusher, url, short_ref, after[:7])
else: else:
commits = _transform_commits_list_to_common_format(commits) commits = _transform_commits_list_to_common_format(commits)
try:
content = get_push_commits_event_message(pusher, url, short_ref, commits, deleted=deleted) content = get_push_commits_event_message(pusher, url, short_ref, commits, deleted=deleted)
except TypeError: # nocoverage This error condition seems to
# be caused by a change in GitHub's APIs. Since we've
# deprecated this webhook, just suppress them with a 40x error.
raise JsonableError(
"Malformed commit data")
return subject, content return subject, content