From 1f34cf4d4dc0979cbe78c0b8775e1e96ea018c44 Mon Sep 17 00:00:00 2001 From: Nate Cavanaugh Date: Wed, 4 Jun 2014 08:27:11 -0700 Subject: [PATCH] Returning stdout to print rather than deferring to os.system, which creates a subprocess --- git-pull-request/git-pull-request.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/git-pull-request/git-pull-request.py b/git-pull-request/git-pull-request.py index 96dcc93862..030e6db481 100755 --- a/git-pull-request/git-pull-request.py +++ b/git-pull-request/git-pull-request.py @@ -679,7 +679,9 @@ def get_pr_stats(repo_name, pull_request_ID): stats = color_text('Average %d change(s) per file' % stats, 'stats-average-change') - ret = os.system("echo '{2}, {3}' && git diff --numstat --pretty='%H' --no-renames {0}..{1} | xargs -0n1 echo -n | cut -f 3- | sed -e 's/^.*\.\(.*\)$/\\1/' | sort | uniq -c | tr '\n' ',' | sed 's/,$//'".format(merge_base, branch_name, shortstat, stats)) + ret = os.popen("echo '{2}, {3}' && git diff --numstat --pretty='%H' --no-renames {0}..{1} | xargs -0n1 echo -n | cut -f 3- | sed -e 's/^.*\.\(.*\)$/\\1/' | sort | uniq -c | tr '\n' ',' | sed 's/,$//'".format(merge_base, branch_name, shortstat, stats)).read().strip() + + print ret stats_footer = options['stats-footer'] @@ -687,7 +689,6 @@ def get_pr_stats(repo_name, pull_request_ID): committers = os.popen("git log {0}..{1} --pretty='%an' --reverse | awk ' !x[$0]++'".format(merge_base, branch_name)).read().strip() committers = committers.split(os.linesep) committers = ', '.join(committers) - print fn = False @@ -712,9 +713,9 @@ def get_pr_stats(repo_name, pull_request_ID): footer_result = footer_tpl.safe_substitute(**pr_obj) if fn: - os.system(footer_result.encode('utf-8')) - else: - print footer_result + footer_result = os.popen(footer_result.encode('utf-8')).read().strip().decode('utf-8') + + print footer_result print else: