xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

integrations: Use universal_newlines in check_output to output as str.

Browse source 
Picked up by mypy; otherwise output is in bytes (at least on python 3).
This commit is contained in:
neiljp (Neil Pilgrim) 2019-11-06 06:34:21 -08:00 committed by Tim Abbott
parent f81843f189
commit 436b619021
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zulip/integrations/git/post-receive
View file

@ -44,7 +44,7 @@ def git_commit_range(oldrev, newrev):
log_cmd = ["git", "log", "--reverse", log_cmd = ["git", "log", "--reverse",
"--pretty=%aE %H %s", "%s..%s" % (oldrev, newrev)] "--pretty=%aE %H %s", "%s..%s" % (oldrev, newrev)]
commits = '' commits = ''
for ln in subprocess.check_output(log_cmd).splitlines(): for ln in subprocess.check_output(log_cmd, universal_newlines=True).splitlines():
author_email, commit_id, subject = ln.split(None, 2) author_email, commit_id, subject = ln.split(None, 2)
if hasattr(config, "format_commit_message"): if hasattr(config, "format_commit_message"):
commits += config.format_commit_message(author_email, subject, commit_id) commits += config.format_commit_message(author_email, subject, commit_id)

2
zulip/integrations/openshift/post_deploy
View file

@ -27,7 +27,7 @@ def get_deployment_details():
# "gear deployments" output example: # "gear deployments" output example:
# Activation time - Deployment ID - Git Ref - Git SHA1 # Activation time - Deployment ID - Git Ref - Git SHA1
# 2017-01-07 15:40:30 -0500 - 9e2b7143 - master - b9ce57c - ACTIVE # 2017-01-07 15:40:30 -0500 - 9e2b7143 - master - b9ce57c - ACTIVE
dep = subprocess.check_output(['gear', 'deployments']).splitlines()[1] dep = subprocess.check_output(['gear', 'deployments'], universal_newlines=True).splitlines()[1]
splits = dep.split(' - ') splits = dep.split(' - ')
return dict(app_name=os.environ['OPENSHIFT_APP_NAME'], return dict(app_name=os.environ['OPENSHIFT_APP_NAME'],