paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 07:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

zerver/views/webhooks/github.py: Fix string literals.

Browse Source 
Change some string literals to unicode.
This commit is contained in:
Eklavya Sharma
2016-06-26 13:53:21 +05:30
committed by Tim Abbott
parent fa4adf0c62
commit a32f83b182
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zerver/views/webhooks/github.py
View File

@@ -22,20 +22,20 @@ class UnknownEventType(Exception):
def github_generic_subject(noun, topic_focus, blob): def github_generic_subject(noun, topic_focus, blob):
# issue and pull_request objects have the same fields we're interested in # issue and pull_request objects have the same fields we're interested in
return '%s: %s %d: %s' % (topic_focus, noun, blob['number'], blob['title']) return u'%s: %s %d: %s' % (topic_focus, noun, blob['number'], blob['title'])
def github_generic_content(noun, payload, blob): def github_generic_content(noun, payload, blob):
action = 'synchronized' if payload['action'] == 'synchronize' else payload['action'] action = 'synchronized' if payload['action'] == 'synchronize' else payload['action']
# issue and pull_request objects have the same fields we're interested in # issue and pull_request objects have the same fields we're interested in
content = ('%s %s [%s %s](%s)' content = (u'%s %s [%s %s](%s)'
% (payload['sender']['login'], % (payload['sender']['login'],
action, action,
noun, noun,
blob['number'], blob['number'],
blob['html_url'])) blob['html_url']))
if payload['action'] in ('opened', 'reopened'): if payload['action'] in ('opened', 'reopened'):
content += '\n\n~~~ quote\n%s\n~~~' % (blob['body'],) content += u'\n\n~~~ quote\n%s\n~~~' % (blob['body'],)
return content return content
@@ -89,7 +89,7 @@ def api_github_v2(user_profile, event, payload, branches, default_stream, commit
subject = github_generic_subject(noun, topic_focus, issue) subject = github_generic_subject(noun, topic_focus, issue)
comment = payload['comment'] comment = payload['comment']
content = ('%s [commented](%s) on [%s %d](%s)\n\n~~~ quote\n%s\n~~~' content = (u'%s [commented](%s) on [%s %d](%s)\n\n~~~ quote\n%s\n~~~'
% (comment['user']['login'], % (comment['user']['login'],
comment['html_url'], comment['html_url'],
noun, noun,
@@ -106,16 +106,16 @@ def api_github_v2(user_profile, event, payload, branches, default_stream, commit
created=payload['created']) created=payload['created'])
elif event == 'commit_comment': elif event == 'commit_comment':
comment = payload['comment'] comment = payload['comment']
subject = '%s: commit %s' % (topic_focus, comment['commit_id']) subject = u'%s: commit %s' % (topic_focus, comment['commit_id'])
content = ('%s [commented](%s)' content = (u'%s [commented](%s)'
% (comment['user']['login'], % (comment['user']['login'],
comment['html_url'])) comment['html_url']))
if comment['line'] is not None: if comment['line'] is not None:
content += ' on `%s`, line %d' % (comment['path'], comment['line']) content += u' on `%s`, line %d' % (comment['path'], comment['line'])
content += '\n\n~~~ quote\n%s\n~~~' % (comment['body'],) content += u'\n\n~~~ quote\n%s\n~~~' % (comment['body'],)
else: else:
raise UnknownEventType(u'Event %s is unknown and cannot be handled' % (event,)) raise UnknownEventType(u'Event %s is unknown and cannot be handled' % (event,))
@@ -208,10 +208,10 @@ def api_github_landing(request, user_profile, event=REQ(),
def build_commit_list_content(commits, branch, compare_url, pusher): def build_commit_list_content(commits, branch, compare_url, pusher):
if compare_url is not None: if compare_url is not None:
push_text = '[pushed](%s)' % (compare_url,) push_text = u'[pushed](%s)' % (compare_url,)
else: else:
push_text = 'pushed' push_text = u'pushed'
content = ('%s %s to branch %s\n\n' content = (u'%s %s to branch %s\n\n'
% (pusher, % (pusher,
push_text, push_text,
branch)) branch))
@@ -220,10 +220,10 @@ def build_commit_list_content(commits, branch, compare_url, pusher):
for commit in truncated_commits: for commit in truncated_commits:
short_id = commit['id'][:7] short_id = commit['id'][:7]
(short_commit_msg, _, _) = commit['message'].partition('\n') (short_commit_msg, _, _) = commit['message'].partition('\n')
content += '* [%s](%s): %s\n' % (short_id, commit['url'], content += u'* [%s](%s): %s\n' % (short_id, commit['url'],
short_commit_msg) short_commit_msg)
if num_commits > COMMITS_IN_LIST_LIMIT: if num_commits > COMMITS_IN_LIST_LIMIT:
content += ('\n[and %d more commits]' content += (u'\n[and %d more commits]'
% (num_commits - COMMITS_IN_LIST_LIMIT,)) % (num_commits - COMMITS_IN_LIST_LIMIT,))
return content return content
@@ -233,11 +233,11 @@ def build_message_from_gitlog(user_profile, name, ref, commits, before, after, u
subject = name subject = name
if re.match(r'^0+$', after): if re.match(r'^0+$', after):
content = '%s deleted branch %s' % (pusher, content = u'%s deleted branch %s' % (pusher,
short_ref) short_ref)
# 'created' and 'forced' are github flags; the second check is for beanstalk # 'created' and 'forced' are github flags; the second check is for beanstalk
elif (forced and not created) or (forced is None and len(commits) == 0): elif (forced and not created) or (forced is None and len(commits) == 0):
content = ('%s [force pushed](%s) to branch %s. Head is now %s' content = (u'%s [force pushed](%s) to branch %s. Head is now %s'
% (pusher, % (pusher,
url, url,
short_ref, short_ref,